You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by kc...@apache.org on 2008/06/24 03:06:06 UTC
svn commit: r670983 - in /incubator/thrift/trunk/lib/rb: COPYING LICENSE
lib/thrift.rb lib/thrift/protocol.rb lib/thrift/protocol/binaryprotocol.rb
lib/thrift/server.rb lib/thrift/transport.rb lib/thrift/transport/socket.rb
Author: kclark
Date: Mon Jun 23 18:06:06 2008
New Revision: 670983
URL: http://svn.apache.org/viewvc?rev=670983&view=rev
Log:
rb: Change the license from Thrift Software License to Apache Software License [THRIFT-38]
>From kevin@rapleaf.com
Modified:
incubator/thrift/trunk/lib/rb/COPYING
incubator/thrift/trunk/lib/rb/LICENSE
incubator/thrift/trunk/lib/rb/lib/thrift.rb
incubator/thrift/trunk/lib/rb/lib/thrift/protocol.rb
incubator/thrift/trunk/lib/rb/lib/thrift/protocol/binaryprotocol.rb
incubator/thrift/trunk/lib/rb/lib/thrift/server.rb
incubator/thrift/trunk/lib/rb/lib/thrift/transport.rb
incubator/thrift/trunk/lib/rb/lib/thrift/transport/socket.rb
Modified: incubator/thrift/trunk/lib/rb/COPYING
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/COPYING?rev=670983&r1=670982&r2=670983&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/COPYING (original)
+++ incubator/thrift/trunk/lib/rb/COPYING Mon Jun 23 18:06:06 2008
@@ -1,24 +1,14 @@
-Thrift Software License
-Copyright (c) 2006- Facebook, Inc.
+Apache Software License
+Copyright (c) 2006- Facebook, Inc. et al.
-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:
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
-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.
+ http://www.apache.org/licenses/LICENSE-2.0
-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.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
Modified: incubator/thrift/trunk/lib/rb/LICENSE
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/LICENSE?rev=670983&r1=670982&r2=670983&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/LICENSE (original)
+++ incubator/thrift/trunk/lib/rb/LICENSE Mon Jun 23 18:06:06 2008
@@ -1,24 +1,14 @@
-Thrift Software License
-Copyright (c) 2006- Facebook, Inc.
+Apache Software License
+Copyright (c) 2006- Facebook, Inc. et al.
-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:
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
-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.
+ http://www.apache.org/licenses/LICENSE-2.0
-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.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
Modified: incubator/thrift/trunk/lib/rb/lib/thrift.rb
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/lib/thrift.rb?rev=670983&r1=670982&r2=670983&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/lib/thrift.rb (original)
+++ incubator/thrift/trunk/lib/rb/lib/thrift.rb Mon Jun 23 18:06:06 2008
@@ -1,6 +1,6 @@
#
# Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Distributed under the Apache Software License
#
# See accompanying file LICENSE or visit the Thrift site at:
# http://developers.facebook.com/thrift/
Modified: incubator/thrift/trunk/lib/rb/lib/thrift/protocol.rb
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/lib/thrift/protocol.rb?rev=670983&r1=670982&r2=670983&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/lib/thrift/protocol.rb (original)
+++ incubator/thrift/trunk/lib/rb/lib/thrift/protocol.rb Mon Jun 23 18:06:06 2008
@@ -1,6 +1,6 @@
#
# Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Distributed under the Apache Software License
#
# See accompanying file LICENSE or visit the Thrift site at:
# http://developers.facebook.com/thrift/
Modified: incubator/thrift/trunk/lib/rb/lib/thrift/protocol/binaryprotocol.rb
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/lib/thrift/protocol/binaryprotocol.rb?rev=670983&r1=670982&r2=670983&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/lib/thrift/protocol/binaryprotocol.rb (original)
+++ incubator/thrift/trunk/lib/rb/lib/thrift/protocol/binaryprotocol.rb Mon Jun 23 18:06:06 2008
@@ -1,6 +1,6 @@
#
# Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Distributed under the Apache Software License
#
# See accompanying file LICENSE or visit the Thrift site at:
# http://developers.facebook.com/thrift/
Modified: incubator/thrift/trunk/lib/rb/lib/thrift/server.rb
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/lib/thrift/server.rb?rev=670983&r1=670982&r2=670983&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/lib/thrift/server.rb (original)
+++ incubator/thrift/trunk/lib/rb/lib/thrift/server.rb Mon Jun 23 18:06:06 2008
@@ -1,5 +1,5 @@
# Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Distributed under the Apache Software License
#
# See accompanying file LICENSE or visit the Thrift site at:
# http://developers.facebook.com/thrift/
Modified: incubator/thrift/trunk/lib/rb/lib/thrift/transport.rb
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/lib/thrift/transport.rb?rev=670983&r1=670982&r2=670983&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/lib/thrift/transport.rb (original)
+++ incubator/thrift/trunk/lib/rb/lib/thrift/transport.rb Mon Jun 23 18:06:06 2008
@@ -1,5 +1,5 @@
# Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Distributed under the Apache Software License
#
# See accompanying file LICENSE or visit the Thrift site at:
# http://developers.facebook.com/thrift/
Modified: incubator/thrift/trunk/lib/rb/lib/thrift/transport/socket.rb
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/lib/thrift/transport/socket.rb?rev=670983&r1=670982&r2=670983&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/lib/thrift/transport/socket.rb (original)
+++ incubator/thrift/trunk/lib/rb/lib/thrift/transport/socket.rb Mon Jun 23 18:06:06 2008
@@ -1,5 +1,5 @@
# Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Distributed under the Apache Software License
#
# See accompanying file LICENSE or visit the Thrift site at:
# http://developers.facebook.com/thrift/