Author: todd
Date: Mon Dec  7 00:42:38 2009
New Revision: 887812

URL: http://svn.apache.org/viewvc?rev=887812&view=rev
Log:
THRIFT-622. Add appropriate licensing information to get Thrift ready for a 
release.

Added:
    incubator/thrift/trunk/doc/old-thrift-license.txt
Modified:
    incubator/thrift/trunk/LICENSE
    incubator/thrift/trunk/NOTICE
    incubator/thrift/trunk/compiler/cpp/Makefile.am
    incubator/thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc
    incubator/thrift/trunk/compiler/cpp/src/generate/t_csharp_generator.cc
    incubator/thrift/trunk/compiler/cpp/src/generate/t_rb_generator.cc
    incubator/thrift/trunk/compiler/cpp/src/generate/t_st_generator.cc
    incubator/thrift/trunk/compiler/cpp/src/thrifty.yy
    
incubator/thrift/trunk/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
    incubator/thrift/trunk/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs
    incubator/thrift/trunk/lib/csharp/src/Protocol/TBinaryProtocol.cs
    incubator/thrift/trunk/lib/csharp/src/Protocol/TField.cs
    incubator/thrift/trunk/lib/csharp/src/Protocol/TList.cs
    incubator/thrift/trunk/lib/csharp/src/Protocol/TMap.cs
    incubator/thrift/trunk/lib/csharp/src/Protocol/TMessage.cs
    incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocol.cs
    incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolException.cs
    incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolFactory.cs
    incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolUtil.cs
    incubator/thrift/trunk/lib/csharp/src/Protocol/TSet.cs
    incubator/thrift/trunk/lib/csharp/src/Protocol/TStruct.cs
    incubator/thrift/trunk/lib/csharp/src/Protocol/TType.cs
    incubator/thrift/trunk/lib/csharp/src/Server/TServer.cs
    incubator/thrift/trunk/lib/csharp/src/Server/TSimpleServer.cs
    incubator/thrift/trunk/lib/csharp/src/Server/TThreadPoolServer.cs
    incubator/thrift/trunk/lib/csharp/src/TApplicationException.cs
    incubator/thrift/trunk/lib/csharp/src/TProcessor.cs
    incubator/thrift/trunk/lib/csharp/src/Transport/TServerSocket.cs
    incubator/thrift/trunk/lib/csharp/src/Transport/TServerTransport.cs
    incubator/thrift/trunk/lib/csharp/src/Transport/TSocket.cs
    incubator/thrift/trunk/lib/csharp/src/Transport/TStreamTransport.cs
    incubator/thrift/trunk/lib/csharp/src/Transport/TTransport.cs
    incubator/thrift/trunk/lib/csharp/src/Transport/TTransportException.cs
    incubator/thrift/trunk/lib/csharp/src/Transport/TTransportFactory.cs
    incubator/thrift/trunk/lib/erl/src/thrift.app.src
    incubator/thrift/trunk/lib/java/ivy.xml
    incubator/thrift/trunk/lib/java/src/org/apache/thrift/TBaseHelper.java
    incubator/thrift/trunk/lib/java/src/org/apache/thrift/TUnion.java
    incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/UnionTest.java
    incubator/thrift/trunk/lib/rb/lib/thrift.rb
    incubator/thrift/trunk/lib/st/README
    incubator/thrift/trunk/lib/st/thrift.st
    incubator/thrift/trunk/test/OptionalRequiredTest.cpp
    incubator/thrift/trunk/test/OptionalRequiredTest.thrift
    incubator/thrift/trunk/test/ThriftTest.thrift
    incubator/thrift/trunk/test/erl/src/test_tether.erl

Modified: incubator/thrift/trunk/LICENSE
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/LICENSE?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/LICENSE (original)
+++ incubator/thrift/trunk/LICENSE Mon Dec  7 00:42:38 2009
@@ -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 <[email protected]>
+#
+#   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
+  [email protected]
+
+ */
+
+---------------------------------------------------
+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)

Modified: incubator/thrift/trunk/NOTICE
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/NOTICE?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/NOTICE (original)
+++ incubator/thrift/trunk/NOTICE Mon Dec  7 00:42:38 2009
@@ -4,23 +4,3 @@
 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)

Modified: incubator/thrift/trunk/compiler/cpp/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/Makefile.am?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/Makefile.am (original)
+++ incubator/thrift/trunk/compiler/cpp/Makefile.am Mon Dec  7 00:42:38 2009
@@ -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 =

Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc 
(original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc Mon Dec 
 7 00:42:38 2009
@@ -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>

Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_csharp_generator.cc
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_csharp_generator.cc?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_csharp_generator.cc 
(original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_csharp_generator.cc Mon 
Dec  7 00:42:38 2009
@@ -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>

Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_rb_generator.cc
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_rb_generator.cc?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_rb_generator.cc 
(original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_rb_generator.cc Mon Dec  
7 00:42:38 2009
@@ -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>

Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_st_generator.cc
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_st_generator.cc?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_st_generator.cc 
(original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_st_generator.cc Mon Dec  
7 00:42:38 2009
@@ -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>

Modified: incubator/thrift/trunk/compiler/cpp/src/thrifty.yy
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/thrifty.yy?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/thrifty.yy (original)
+++ incubator/thrift/trunk/compiler/cpp/src/thrifty.yy Mon Dec  7 00:42:38 2009
@@ -1145,4 +1145,4 @@
       $$->val = $3;
     }
 
-%%
\ No newline at end of file
+%%

Added: incubator/thrift/trunk/doc/old-thrift-license.txt
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/doc/old-thrift-license.txt?rev=887812&view=auto
==============================================================================
--- incubator/thrift/trunk/doc/old-thrift-license.txt (added)
+++ incubator/thrift/trunk/doc/old-thrift-license.txt Mon Dec  7 00:42:38 2009
@@ -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.

Modified: 
incubator/thrift/trunk/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- 
incubator/thrift/trunk/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs 
(original)
+++ 
incubator/thrift/trunk/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs 
Mon Dec  7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs 
(original)
+++ incubator/thrift/trunk/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs Mon Dec  
7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Protocol/TBinaryProtocol.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Protocol/TBinaryProtocol.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Protocol/TBinaryProtocol.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Protocol/TBinaryProtocol.cs Mon Dec  
7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Protocol/TField.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Protocol/TField.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Protocol/TField.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Protocol/TField.cs Mon Dec  7 
00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Protocol/TList.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Protocol/TList.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Protocol/TList.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Protocol/TList.cs Mon Dec  7 00:42:38 
2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Protocol/TMap.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Protocol/TMap.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Protocol/TMap.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Protocol/TMap.cs Mon Dec  7 00:42:38 
2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Protocol/TMessage.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Protocol/TMessage.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Protocol/TMessage.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Protocol/TMessage.cs Mon Dec  7 
00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocol.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocol.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocol.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocol.cs Mon Dec  7 
00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolException.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolException.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolException.cs 
(original)
+++ incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolException.cs Mon 
Dec  7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolFactory.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolFactory.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolFactory.cs 
(original)
+++ incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolFactory.cs Mon Dec  
7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolUtil.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolUtil.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolUtil.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Protocol/TProtocolUtil.cs Mon Dec  7 
00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Protocol/TSet.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Protocol/TSet.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Protocol/TSet.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Protocol/TSet.cs Mon Dec  7 00:42:38 
2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Protocol/TStruct.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Protocol/TStruct.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Protocol/TStruct.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Protocol/TStruct.cs Mon Dec  7 
00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Protocol/TType.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Protocol/TType.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Protocol/TType.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Protocol/TType.cs Mon Dec  7 00:42:38 
2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Server/TServer.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Server/TServer.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Server/TServer.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Server/TServer.cs Mon Dec  7 00:42:38 
2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Server/TSimpleServer.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Server/TSimpleServer.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Server/TSimpleServer.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Server/TSimpleServer.cs Mon Dec  7 
00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Server/TThreadPoolServer.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Server/TThreadPoolServer.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Server/TThreadPoolServer.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Server/TThreadPoolServer.cs Mon Dec  
7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/TApplicationException.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/TApplicationException.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/TApplicationException.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/TApplicationException.cs Mon Dec  7 
00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/TProcessor.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/TProcessor.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/TProcessor.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/TProcessor.cs Mon Dec  7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Transport/TServerSocket.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Transport/TServerSocket.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Transport/TServerSocket.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Transport/TServerSocket.cs Mon Dec  7 
00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Transport/TServerTransport.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Transport/TServerTransport.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Transport/TServerTransport.cs 
(original)
+++ incubator/thrift/trunk/lib/csharp/src/Transport/TServerTransport.cs Mon Dec 
 7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Transport/TSocket.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Transport/TSocket.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Transport/TSocket.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Transport/TSocket.cs Mon Dec  7 
00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Transport/TStreamTransport.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Transport/TStreamTransport.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Transport/TStreamTransport.cs 
(original)
+++ incubator/thrift/trunk/lib/csharp/src/Transport/TStreamTransport.cs Mon Dec 
 7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Transport/TTransport.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Transport/TTransport.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Transport/TTransport.cs (original)
+++ incubator/thrift/trunk/lib/csharp/src/Transport/TTransport.cs Mon Dec  7 
00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Transport/TTransportException.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Transport/TTransportException.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Transport/TTransportException.cs 
(original)
+++ incubator/thrift/trunk/lib/csharp/src/Transport/TTransportException.cs Mon 
Dec  7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/csharp/src/Transport/TTransportFactory.cs
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/csharp/src/Transport/TTransportFactory.cs?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/csharp/src/Transport/TTransportFactory.cs 
(original)
+++ incubator/thrift/trunk/lib/csharp/src/Transport/TTransportFactory.cs Mon 
Dec  7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/erl/src/thrift.app.src
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift.app.src?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift.app.src (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift.app.src Mon Dec  7 00:42:38 2009
@@ -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%,
  [

Modified: incubator/thrift/trunk/lib/java/ivy.xml
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/ivy.xml?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/ivy.xml (original)
+++ incubator/thrift/trunk/lib/java/ivy.xml Mon Dec  7 00:42:38 2009
@@ -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>

Modified: incubator/thrift/trunk/lib/java/src/org/apache/thrift/TBaseHelper.java
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/TBaseHelper.java?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/src/org/apache/thrift/TBaseHelper.java 
(original)
+++ incubator/thrift/trunk/lib/java/src/org/apache/thrift/TBaseHelper.java Mon 
Dec  7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/java/src/org/apache/thrift/TUnion.java
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/TUnion.java?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/src/org/apache/thrift/TUnion.java (original)
+++ incubator/thrift/trunk/lib/java/src/org/apache/thrift/TUnion.java Mon Dec  
7 00:42:38 2009
@@ -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;

Modified: 
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/UnionTest.java
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/UnionTest.java?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/UnionTest.java 
(original)
+++ incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/UnionTest.java 
Mon Dec  7 00:42:38 2009
@@ -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;

Modified: incubator/thrift/trunk/lib/rb/lib/thrift.rb
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/lib/thrift.rb?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/lib/thrift.rb (original)
+++ incubator/thrift/trunk/lib/rb/lib/thrift.rb Mon Dec  7 00:42:38 2009
@@ -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'
\ No newline at end of file
+require 'thrift/thrift_native'

Modified: incubator/thrift/trunk/lib/st/README
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/st/README?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/st/README (original)
+++ incubator/thrift/trunk/lib/st/README Mon Dec  7 00:42:38 2009
@@ -22,6 +22,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.
+
 Library
 =======
 

Modified: incubator/thrift/trunk/lib/st/thrift.st
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/st/thrift.st?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/st/thrift.st (original)
+++ incubator/thrift/trunk/lib/st/thrift.st Mon Dec  7 00:42:38 2009
@@ -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. 
 "
 
 SystemOrganization addCategory: #Thrift!

Modified: incubator/thrift/trunk/test/OptionalRequiredTest.cpp
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/OptionalRequiredTest.cpp?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/test/OptionalRequiredTest.cpp (original)
+++ incubator/thrift/trunk/test/OptionalRequiredTest.cpp Mon Dec  7 00:42:38 
2009
@@ -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>

Modified: incubator/thrift/trunk/test/OptionalRequiredTest.thrift
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/OptionalRequiredTest.thrift?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/test/OptionalRequiredTest.thrift (original)
+++ incubator/thrift/trunk/test/OptionalRequiredTest.thrift Mon Dec  7 00:42:38 
2009
@@ -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

Modified: incubator/thrift/trunk/test/ThriftTest.thrift
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/ThriftTest.thrift?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/test/ThriftTest.thrift (original)
+++ incubator/thrift/trunk/test/ThriftTest.thrift Mon Dec  7 00:42:38 2009
@@ -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

Modified: incubator/thrift/trunk/test/erl/src/test_tether.erl
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/erl/src/test_tether.erl?rev=887812&r1=887811&r2=887812&view=diff
==============================================================================
--- incubator/thrift/trunk/test/erl/src/test_tether.erl (original)
+++ incubator/thrift/trunk/test/erl/src/test_tether.erl Mon Dec  7 00:42:38 2009
@@ -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.
 


Reply via email to