diff options
| author | Todd Lipcon <todd@apache.org> | 2009-12-07 00:42:38 +0000 |
|---|---|---|
| committer | Todd Lipcon <todd@apache.org> | 2009-12-07 00:42:38 +0000 |
| commit | 53ae9f39d5118d9b13774413e7989b9f0fb1a8eb (patch) | |
| tree | 5cc5f76a2afed365f70f366994e255dbda59235c | |
| parent | f5dea4c7f31703cdc0c347eb7ec429fc5864afb4 (diff) | |
| download | thrift-53ae9f39d5118d9b13774413e7989b9f0fb1a8eb.tar.gz | |
THRIFT-622. Add appropriate licensing information to get Thrift ready for a release.
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@887812 13f79535-47bb-0310-9956-ffa450edef68
47 files changed, 405 insertions, 22 deletions
@@ -200,3 +200,132 @@ WITHOUT 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. + +-------------------------------------------------- +The following files are licensed under the MIT License: + lib/erl/build/beamver + lib/erl/build/buildtargets.mk + lib/erl/build/colors.mk + lib/erl/build/docs.mk + lib/erl/build/mime.types + lib/erl/build/otp.mk + lib/erl/build/otp_subdir.mk + lib/erl/build/raw_test.mk + lib/erl/src/Makefile + +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) @@ -4,23 +4,3 @@ Copyright 2006-2009 The Apache Software Foundation, et al. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -Some files in this distribution are distributed under different terms -from the rest of Apache Thrift. Please see individual files for -license information. - -In addition, the following unlabelled files are distributed under -specific terms. Please see the "doc" directory for the text of their -licenses. - - lib/rb/setup.rb: GNU Lesser General Public License 2.1 (lgpl-2.1.txt) - lib/ocaml/OCamlMakefile: GNU Lesser General Public License 2.1 (lgpl-2.1.txt) - lib/ocaml/README-OCamlMakefile: GNU Lesser General Public License 2.1 (lgpl-2.1.txt) - lib/erl/build/beamver: MIT License (otp-base-license.txt) - lib/erl/build/buildtargets.mk: MIT License (otp-base-license.txt) - lib/erl/build/colors.mk: MIT License (otp-base-license.txt) - lib/erl/build/docs.mk: MIT License (otp-base-license.txt) - lib/erl/build/mime.types: MIT License (otp-base-license.txt) - lib/erl/build/otp.mk: MIT License (otp-base-license.txt) - lib/erl/build/otp_subdir.mk: MIT License (otp-base-license.txt) - lib/erl/build/raw_test.mk: MIT License (otp-base-license.txt) - lib/erl/src/Makefile: MIT License (otp-base-license.txt) diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am index 3838facfa..fa8d1cab8 100644 --- a/compiler/cpp/Makefile.am +++ b/compiler/cpp/Makefile.am @@ -16,6 +16,10 @@ # 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. AM_YFLAGS = -d BUILT_SOURCES = diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc index c4549f3b6..6a9155043 100644 --- a/compiler/cpp/src/generate/t_cpp_generator.cc +++ b/compiler/cpp/src/generate/t_cpp_generator.cc @@ -15,6 +15,10 @@ * 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> diff --git a/compiler/cpp/src/generate/t_csharp_generator.cc b/compiler/cpp/src/generate/t_csharp_generator.cc index 96c0f6ea3..7bdbf18d0 100644 --- a/compiler/cpp/src/generate/t_csharp_generator.cc +++ b/compiler/cpp/src/generate/t_csharp_generator.cc @@ -15,6 +15,10 @@ * 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> diff --git a/compiler/cpp/src/generate/t_rb_generator.cc b/compiler/cpp/src/generate/t_rb_generator.cc index 5e53bcc25..55db0f7ea 100644 --- a/compiler/cpp/src/generate/t_rb_generator.cc +++ b/compiler/cpp/src/generate/t_rb_generator.cc @@ -15,6 +15,10 @@ * 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> diff --git a/compiler/cpp/src/generate/t_st_generator.cc b/compiler/cpp/src/generate/t_st_generator.cc index 3600a3b86..1d2d32385 100644 --- a/compiler/cpp/src/generate/t_st_generator.cc +++ b/compiler/cpp/src/generate/t_st_generator.cc @@ -15,6 +15,10 @@ * 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> diff --git a/compiler/cpp/src/thrifty.yy b/compiler/cpp/src/thrifty.yy index 00e939c85..987dd8d4e 100644 --- a/compiler/cpp/src/thrifty.yy +++ b/compiler/cpp/src/thrifty.yy @@ -1145,4 +1145,4 @@ TypeAnnotation: $$->val = $3; } -%%
\ No newline at end of file +%% diff --git a/doc/old-thrift-license.txt b/doc/old-thrift-license.txt new file mode 100644 index 000000000..0101a7dc8 --- /dev/null +++ b/doc/old-thrift-license.txt @@ -0,0 +1,24 @@ +Thrift Software License +Copyright (c) 2006- Facebook, Inc. + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +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, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN 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/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs b/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs index d79c2039f..def4c1c30 100644 --- a/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs +++ b/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs b/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs index 4389e0a6e..75bb33969 100644 --- a/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs +++ b/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Protocol/TBinaryProtocol.cs b/lib/csharp/src/Protocol/TBinaryProtocol.cs index 14ca43b74..4b3980e7f 100644 --- a/lib/csharp/src/Protocol/TBinaryProtocol.cs +++ b/lib/csharp/src/Protocol/TBinaryProtocol.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Protocol/TField.cs b/lib/csharp/src/Protocol/TField.cs index 485c994bb..fa1058442 100644 --- a/lib/csharp/src/Protocol/TField.cs +++ b/lib/csharp/src/Protocol/TField.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Protocol/TList.cs b/lib/csharp/src/Protocol/TList.cs index dbc5c40e8..a651eb1eb 100644 --- a/lib/csharp/src/Protocol/TList.cs +++ b/lib/csharp/src/Protocol/TList.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Protocol/TMap.cs b/lib/csharp/src/Protocol/TMap.cs index 8b53f8990..5c8d65052 100644 --- a/lib/csharp/src/Protocol/TMap.cs +++ b/lib/csharp/src/Protocol/TMap.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Protocol/TMessage.cs b/lib/csharp/src/Protocol/TMessage.cs index 8cb6e0b1a..8e96da5ee 100644 --- a/lib/csharp/src/Protocol/TMessage.cs +++ b/lib/csharp/src/Protocol/TMessage.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Protocol/TProtocol.cs b/lib/csharp/src/Protocol/TProtocol.cs index acf9c1b3d..27c7dc11b 100644 --- a/lib/csharp/src/Protocol/TProtocol.cs +++ b/lib/csharp/src/Protocol/TProtocol.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Protocol/TProtocolException.cs b/lib/csharp/src/Protocol/TProtocolException.cs index 9c2504766..d570bb823 100644 --- a/lib/csharp/src/Protocol/TProtocolException.cs +++ b/lib/csharp/src/Protocol/TProtocolException.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Protocol/TProtocolFactory.cs b/lib/csharp/src/Protocol/TProtocolFactory.cs index ae976acd5..ebc7367be 100644 --- a/lib/csharp/src/Protocol/TProtocolFactory.cs +++ b/lib/csharp/src/Protocol/TProtocolFactory.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Protocol/TProtocolUtil.cs b/lib/csharp/src/Protocol/TProtocolUtil.cs index 57cef0eff..82cd3e35f 100644 --- a/lib/csharp/src/Protocol/TProtocolUtil.cs +++ b/lib/csharp/src/Protocol/TProtocolUtil.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Protocol/TSet.cs b/lib/csharp/src/Protocol/TSet.cs index ac73992dc..aff7f65d6 100644 --- a/lib/csharp/src/Protocol/TSet.cs +++ b/lib/csharp/src/Protocol/TSet.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Protocol/TStruct.cs b/lib/csharp/src/Protocol/TStruct.cs index 0cac2733e..37d110680 100644 --- a/lib/csharp/src/Protocol/TStruct.cs +++ b/lib/csharp/src/Protocol/TStruct.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Protocol/TType.cs b/lib/csharp/src/Protocol/TType.cs index c2d78edc8..efc7beff6 100644 --- a/lib/csharp/src/Protocol/TType.cs +++ b/lib/csharp/src/Protocol/TType.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Server/TServer.cs b/lib/csharp/src/Server/TServer.cs index 61a9416fc..7bf274725 100644 --- a/lib/csharp/src/Server/TServer.cs +++ b/lib/csharp/src/Server/TServer.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Server/TSimpleServer.cs b/lib/csharp/src/Server/TSimpleServer.cs index 34a51de4a..c6fd99ea7 100644 --- a/lib/csharp/src/Server/TSimpleServer.cs +++ b/lib/csharp/src/Server/TSimpleServer.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Server/TThreadPoolServer.cs b/lib/csharp/src/Server/TThreadPoolServer.cs index efc71f01e..cf8354e9f 100644 --- a/lib/csharp/src/Server/TThreadPoolServer.cs +++ b/lib/csharp/src/Server/TThreadPoolServer.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/TApplicationException.cs b/lib/csharp/src/TApplicationException.cs index 127196866..cc29f0aa7 100644 --- a/lib/csharp/src/TApplicationException.cs +++ b/lib/csharp/src/TApplicationException.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/TProcessor.cs b/lib/csharp/src/TProcessor.cs index cbb55b798..dc1b795d9 100644 --- a/lib/csharp/src/TProcessor.cs +++ b/lib/csharp/src/TProcessor.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Transport/TServerSocket.cs b/lib/csharp/src/Transport/TServerSocket.cs index 2658fce89..218291afb 100644 --- a/lib/csharp/src/Transport/TServerSocket.cs +++ b/lib/csharp/src/Transport/TServerSocket.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Transport/TServerTransport.cs b/lib/csharp/src/Transport/TServerTransport.cs index 9cb52e5c6..c99d07ffa 100644 --- a/lib/csharp/src/Transport/TServerTransport.cs +++ b/lib/csharp/src/Transport/TServerTransport.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Transport/TSocket.cs b/lib/csharp/src/Transport/TSocket.cs index 18cf1547b..4c64a3607 100644 --- a/lib/csharp/src/Transport/TSocket.cs +++ b/lib/csharp/src/Transport/TSocket.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Transport/TStreamTransport.cs b/lib/csharp/src/Transport/TStreamTransport.cs index 7681e0d97..60a8412a1 100644 --- a/lib/csharp/src/Transport/TStreamTransport.cs +++ b/lib/csharp/src/Transport/TStreamTransport.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Transport/TTransport.cs b/lib/csharp/src/Transport/TTransport.cs index 83f6776c0..d2391c204 100644 --- a/lib/csharp/src/Transport/TTransport.cs +++ b/lib/csharp/src/Transport/TTransport.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Transport/TTransportException.cs b/lib/csharp/src/Transport/TTransportException.cs index fe10faa5e..b96f7e872 100644 --- a/lib/csharp/src/Transport/TTransportException.cs +++ b/lib/csharp/src/Transport/TTransportException.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/csharp/src/Transport/TTransportFactory.cs b/lib/csharp/src/Transport/TTransportFactory.cs index 3d3694db2..8f4f15dce 100644 --- a/lib/csharp/src/Transport/TTransportFactory.cs +++ b/lib/csharp/src/Transport/TTransportFactory.cs @@ -15,6 +15,10 @@ * 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; diff --git a/lib/erl/src/thrift.app.src b/lib/erl/src/thrift.app.src index 681b3eb3e..f5472bfe1 100644 --- a/lib/erl/src/thrift.app.src +++ b/lib/erl/src/thrift.app.src @@ -1,3 +1,21 @@ +%% +%% Licensed to the Apache Software Foundation (ASF) under one +%% or more contributor license agreements. See the NOTICE file +%% distributed with this work for additional information +%% regarding copyright ownership. The ASF licenses this file +%% to you under the Apache License, Version 2.0 (the +%% "License"); you may not use this file except in compliance +%% with the License. You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, +%% software distributed under the License is distributed on an +%% "AS IS" BASIS, WITHOUT 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, %APP_NAME%, [ diff --git a/lib/java/ivy.xml b/lib/java/ivy.xml index 64203b9c5..ca6ecb33f 100644 --- a/lib/java/ivy.xml +++ b/lib/java/ivy.xml @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <ivy-module version="1.0"> <info organisation="jayasoft" module="hello-ivy" /> <dependencies> diff --git a/lib/java/src/org/apache/thrift/TBaseHelper.java b/lib/java/src/org/apache/thrift/TBaseHelper.java index 2ec71f559..b41daae58 100644 --- a/lib/java/src/org/apache/thrift/TBaseHelper.java +++ b/lib/java/src/org/apache/thrift/TBaseHelper.java @@ -1,3 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF 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.List; diff --git a/lib/java/src/org/apache/thrift/TUnion.java b/lib/java/src/org/apache/thrift/TUnion.java index 219669f0f..7e4f0afc3 100644 --- a/lib/java/src/org/apache/thrift/TUnion.java +++ b/lib/java/src/org/apache/thrift/TUnion.java @@ -1,3 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF 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.ArrayList; diff --git a/lib/java/test/org/apache/thrift/test/UnionTest.java b/lib/java/test/org/apache/thrift/test/UnionTest.java index 670a33fae..551e40784 100644 --- a/lib/java/test/org/apache/thrift/test/UnionTest.java +++ b/lib/java/test/org/apache/thrift/test/UnionTest.java @@ -1,3 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF 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.protocol.TBinaryProtocol; diff --git a/lib/rb/lib/thrift.rb b/lib/rb/lib/thrift.rb index 88562e137..4d4e130ae 100644 --- a/lib/rb/lib/thrift.rb +++ b/lib/rb/lib/thrift.rb @@ -16,6 +16,9 @@ # 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__) @@ -56,4 +59,4 @@ require 'thrift/server/simple_server' require 'thrift/server/threaded_server' require 'thrift/server/thread_pool_server' -require 'thrift/thrift_native'
\ No newline at end of file +require 'thrift/thrift_native' diff --git a/lib/st/README b/lib/st/README index be865b8f9..5b5fdeefc 100644 --- a/lib/st/README +++ b/lib/st/README @@ -22,6 +22,10 @@ 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 ======= diff --git a/lib/st/thrift.st b/lib/st/thrift.st index 6883539ff..8675e01fd 100644 --- a/lib/st/thrift.st +++ b/lib/st/thrift.st @@ -15,6 +15,10 @@ AS IS BASIS, WITHOUT 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! diff --git a/test/OptionalRequiredTest.cpp b/test/OptionalRequiredTest.cpp index 5743ce303..747260359 100644 --- a/test/OptionalRequiredTest.cpp +++ b/test/OptionalRequiredTest.cpp @@ -15,6 +15,10 @@ * 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> diff --git a/test/OptionalRequiredTest.thrift b/test/OptionalRequiredTest.thrift index f7d1fd6a1..67e6f5879 100644 --- a/test/OptionalRequiredTest.thrift +++ b/test/OptionalRequiredTest.thrift @@ -15,6 +15,10 @@ * 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 diff --git a/test/ThriftTest.thrift b/test/ThriftTest.thrift index f16c02e35..d25183bed 100644 --- a/test/ThriftTest.thrift +++ b/test/ThriftTest.thrift @@ -15,6 +15,10 @@ * 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 java thrift.test diff --git a/test/erl/src/test_tether.erl b/test/erl/src/test_tether.erl index c5051455e..dc11a9a9a 100644 --- a/test/erl/src/test_tether.erl +++ b/test/erl/src/test_tether.erl @@ -1,3 +1,21 @@ +%% +%% Licensed to the Apache Software Foundation (ASF) under one +%% or more contributor license agreements. See the NOTICE file +%% distributed with this work for additional information +%% regarding copyright ownership. The ASF licenses this file +%% to you under the Apache License, Version 2.0 (the +%% "License"); you may not use this file except in compliance +%% with the License. You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, +%% software distributed under the License is distributed on an +%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +%% KIND, either express or implied. See the License for the +%% specific language governing permissions and limitations +%% under the License. +%% %% Tests the behavior of clients in the face of transport errors. %% Makes sure start, start_linked, and start_tethered work as expected. |