You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ripple.apache.org by ti...@apache.org on 2015/05/12 05:22:52 UTC
incubator-ripple git commit: Reinstate XMLHttpRequest.js license.
Repository: incubator-ripple
Updated Branches:
refs/heads/master 7ba34149c -> e4db9e25d
Reinstate XMLHttpRequest.js license.
Reinstates the XMLHttpRequest.js license in LICENSE, referencing the correct version of the file (that was licensed under the Apache license).
Also indents licenses for code that is contained within OpenLayers.js to make that a little clearer.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ripple/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ripple/commit/e4db9e25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ripple/tree/e4db9e25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ripple/diff/e4db9e25
Branch: refs/heads/master
Commit: e4db9e25de849048d8361da6e5a979e0ce20bd87
Parents: 7ba3414
Author: Tim Barham <ti...@microsoft.com>
Authored: Tue May 12 13:21:16 2015 +1000
Committer: Tim Barham <ti...@microsoft.com>
Committed: Tue May 12 13:21:16 2015 +1000
----------------------------------------------------------------------
LICENSE | 106 ++++++++++++++++++++++++++++++++---------------------------
1 file changed, 58 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/e4db9e25/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 975fc16..6642acd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -379,60 +379,70 @@ hullbreach@hullbreachonline.com
(For uncompressed versions of the code used please see the
OpenLayers SVN repository: <http://openlayers.org/>)
--------------------------------------------------------
- Contains portions of Rico <http://openrico.org/>
-
- Copyright 2005 Sabre Airline Solutions
-
- 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 top of this file or a the following
- link:
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT 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 portions of Rico <http://openrico.org/>
--------------------------------------------------------
- Contains portions of Gears <http://code.google.com/apis/gears/>
+ Copyright 2005 Sabre Airline Solutions
- Copyright 2007, Google Inc.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- 3. Neither the name of Google Inc. nor the names of its contributors may be
- used to endorse or promote products derived from this software without
- specific prior written permission.
+ 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 top of this file or a the following
+ link:
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT 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 XMLHttpRequest.js
+ <https://code.google.com/p/xmlhttprequest/source/browse/trunk/source/XMLHttpRequest.js?r=29>
+ Copyright 2007 Sergey Ilinsky (http://www.ilinsky.com)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ -------------------------------------------------------
+ Contains portions of Gears <http://code.google.com/apis/gears/>
+
+ Copyright 2007, Google Inc.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ 3. Neither the name of Google Inc. nor the names of its contributors may be
+ used to endorse or promote products derived from this software without
+ specific prior written permission.
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- Sets up google.gears.*, which is *the only* supported way to access Gears.
+ Sets up google.gears.*, which is *the only* supported way to access Gears.
- Circumvent this file at your own risk!
+ Circumvent this file at your own risk!
- In the future, Gears may automatically define google.gears.* without this
- file. Gears may use these objects to transparently fix bugs and compatibility
- issues. Applications that use the code below will continue to work seamlessly
- when that happens.
+ In the future, Gears may automatically define google.gears.* without this
+ file. Gears may use these objects to transparently fix bugs and compatibility
+ issues. Applications that use the code below will continue to work seamlessly
+ when that happens.
-------------------------------------------------------
* accountingjs *