Browse files

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
  • Loading branch information...
1 parent f5dea4c commit 53ae9f39d5118d9b13774413e7989b9f0fb1a8eb @toddlipcon toddlipcon committed Dec 7, 2009
Showing with 405 additions and 22 deletions.
  1. +129 −0 LICENSE
  2. +0 −20 NOTICE
  3. +4 −0 compiler/cpp/Makefile.am
  4. +4 −0 compiler/cpp/src/generate/t_cpp_generator.cc
  5. +4 −0 compiler/cpp/src/generate/t_csharp_generator.cc
  6. +4 −0 compiler/cpp/src/generate/t_rb_generator.cc
  7. +4 −0 compiler/cpp/src/generate/t_st_generator.cc
  8. +1 −1 compiler/cpp/src/thrifty.yy
  9. +24 −0 doc/old-thrift-license.txt
  10. +4 −0 lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
  11. +4 −0 lib/csharp/ThriftMSBuildTask/ThriftBuild.cs
  12. +4 −0 lib/csharp/src/Protocol/TBinaryProtocol.cs
  13. +4 −0 lib/csharp/src/Protocol/TField.cs
  14. +4 −0 lib/csharp/src/Protocol/TList.cs
  15. +4 −0 lib/csharp/src/Protocol/TMap.cs
  16. +4 −0 lib/csharp/src/Protocol/TMessage.cs
  17. +4 −0 lib/csharp/src/Protocol/TProtocol.cs
  18. +4 −0 lib/csharp/src/Protocol/TProtocolException.cs
  19. +4 −0 lib/csharp/src/Protocol/TProtocolFactory.cs
  20. +4 −0 lib/csharp/src/Protocol/TProtocolUtil.cs
  21. +4 −0 lib/csharp/src/Protocol/TSet.cs
  22. +4 −0 lib/csharp/src/Protocol/TStruct.cs
  23. +4 −0 lib/csharp/src/Protocol/TType.cs
  24. +4 −0 lib/csharp/src/Server/TServer.cs
  25. +4 −0 lib/csharp/src/Server/TSimpleServer.cs
  26. +4 −0 lib/csharp/src/Server/TThreadPoolServer.cs
  27. +4 −0 lib/csharp/src/TApplicationException.cs
  28. +4 −0 lib/csharp/src/TProcessor.cs
  29. +4 −0 lib/csharp/src/Transport/TServerSocket.cs
  30. +4 −0 lib/csharp/src/Transport/TServerTransport.cs
  31. +4 −0 lib/csharp/src/Transport/TSocket.cs
  32. +4 −0 lib/csharp/src/Transport/TStreamTransport.cs
  33. +4 −0 lib/csharp/src/Transport/TTransport.cs
  34. +4 −0 lib/csharp/src/Transport/TTransportException.cs
  35. +4 −0 lib/csharp/src/Transport/TTransportFactory.cs
  36. +18 −0 lib/erl/src/thrift.app.src
  37. +16 −0 lib/java/ivy.xml
  38. +17 −0 lib/java/src/org/apache/thrift/TBaseHelper.java
  39. +17 −0 lib/java/src/org/apache/thrift/TUnion.java
  40. +17 −0 lib/java/test/org/apache/thrift/test/UnionTest.java
  41. +4 −1 lib/rb/lib/thrift.rb
  42. +4 −0 lib/st/README
  43. +4 −0 lib/st/thrift.st
  44. +4 −0 test/OptionalRequiredTest.cpp
  45. +4 −0 test/OptionalRequiredTest.thrift
  46. +4 −0 test/ThriftTest.thrift
  47. +18 −0 test/erl/src/test_tether.erl
View
129 LICENSE
@@ -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)
View
20 NOTICE
@@ -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)
View
4 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 =
View
4 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>
View
4 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>
View
4 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>
View
4 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>
View
2 compiler/cpp/src/thrifty.yy
@@ -1145,4 +1145,4 @@ TypeAnnotation:
$$->val = $3;
}
-%%
+%%
View
24 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.
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
4 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;
View
18 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%,
[
View
16 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>
View
17 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;
View
17 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;
View
17 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;
View
5 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/threaded_server'
require 'thrift/server/thread_pool_server'
-require 'thrift/thrift_native'
+require 'thrift/thrift_native'
View
4 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
=======
View
4 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!
View
4 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>
View
4 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
View
4 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
View
18 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.

0 comments on commit 53ae9f3

Please sign in to comment.