summaryrefslogtreecommitdiff
path: root/docs/licenses
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-07-14 17:42:54 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-07-14 17:42:54 +0000
commit173a8a1a06b5736678c189284a2976448e4de139 (patch)
tree292f78ecd329ad29a13d81298eb925ffeaed6bda /docs/licenses
parent376085286486500c39d563e3b5d91befe2453f34 (diff)
downloadscala-173a8a1a06b5736678c189284a2976448e4de139.tar.gz
scala-173a8a1a06b5736678c189284a2976448e4de139.tar.bz2
scala-173a8a1a06b5736678c189284a2976448e4de139.zip
Merged revisions 22108,22114,22121,22130-22131,...
Merged revisions 22108,22114,22121,22130-22131,22137,22140-22142,22147-22149,22167-22168, 22174,22176-22177,22182,22186,22188-22189,22194-22199,22211,22215,22234, 22248-22249,22260-22261,22276 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r22108 | odersky | 2010-05-31 19:23:38 +0200 (Mon, 31 May 2010) | 1 line made hashset more robust for concurrent access to reduce eclipse race conditions. ........ r22114 | prokopec | 2010-06-01 18:15:40 +0200 (Tue, 01 Jun 2010) | 1 line Fixes #3496. No review. ........ r22121 | rytz | 2010-06-02 11:57:41 +0200 (Wed, 02 Jun 2010) | 1 line some tests. no review ........ r22130 | dubochet | 2010-06-02 15:11:24 +0200 (Wed, 02 Jun 2010) | 1 line Removed unnecessary files containing code with an uncertain copyright status. ........ r22131 | dubochet | 2010-06-02 15:41:19 +0200 (Wed, 02 Jun 2010) | 1 line Added mandatory copyright notices for some libraries shipped with Scala. ........ r22137 | dubochet | 2010-06-02 16:04:52 +0200 (Wed, 02 Jun 2010) | 1 line Added more license notices for things shipped with Scala. ........ r22140 | dubochet | 2010-06-02 18:23:43 +0200 (Wed, 02 Jun 2010) | 1 line [scaladoc] Updated man page for Scaladoc 2. ........ r22141 | prokopec | 2010-06-02 18:31:56 +0200 (Wed, 02 Jun 2010) | 4 lines Partially solves the problem for #3502. review by extempore This commit reimplements filter for Streams, but does not reimplement map in StreamWithFilter. The problem is that GC can't collect instances of Streams residing on the stack if there are multiple references to the Stream (more than a single one on the stack on which a Stream method is invoked). In the case of a StreamWithFilter, being an inner class, there is always an `$outer` reference to the outer object, so there is little GC can do. Possible solution - change the return type of WithFilter to something else (in TraversableLike) to allow it to return objects that don't have to subclass TraversableLike.WithFilter, and reimplement the withFilter method in Stream to simply call `filter` method - in the case of Streams, `withFilter` has little sense in either case... ........ r22142 | prokopec | 2010-06-02 19:09:39 +0200 (Wed, 02 Jun 2010) | 1 line Fixes #3508. No review is necessary. ........ r22147 | prokopec | 2010-06-03 10:52:01 +0200 (Thu, 03 Jun 2010) | 3 lines Fixes #3511 by adding a custom StreamView. review by extempore - please advise if we should keep this or not ........ r22148 | prokopec | 2010-06-03 10:55:14 +0200 (Thu, 03 Jun 2010) | 1 line Forgot to add stream view classes for #3511. review by extempore. ........ r22149 | dubochet | 2010-06-03 11:22:57 +0200 (Thu, 03 Jun 2010) | 1 line [scaladoc] Fixed typo in Scaladoc man page (thanks Stéphane). No review. ........ r22167 | extempore | 2010-06-04 20:34:02 +0200 (Fri, 04 Jun 2010) | 4 lines Fix for init-order caused NPE in NumericRange. While I was in there ran across some tortured logic trying to accomodate the long abandoned idea of having 5 != 5L, so simplified the contains method. Closes #3518, no review. ........ r22168 | extempore | 2010-06-04 21:15:10 +0200 (Fri, 04 Jun 2010) | 3 lines Tracked down why the jvm/natives.scala fails for me and apparently not anyone else. Rebuilt libnatives.jnlib to accomodate x86-64, and it seems to pass. No review. ........ r22174 | michelou | 2010-06-05 21:25:28 +0200 (Sat, 05 Jun 2010) | 2 lines added/updated Android examples ........ r22176 | odersky | 2010-06-06 09:46:43 +0200 (Sun, 06 Jun 2010) | 2 lines Overwrote copyToArray for efficiency. ........ r22177 | odersky | 2010-06-06 09:47:21 +0200 (Sun, 06 Jun 2010) | 2 lines Fixed a typo in a use case ........ r22182 | prokopec | 2010-06-07 12:15:32 +0200 (Mon, 07 Jun 2010) | 2 lines Adding parallel collections to trunk. sabbus also edited to add parallel collections to the library jar - review by phaller ........ r22186 | extempore | 2010-06-07 23:00:46 +0200 (Mon, 07 Jun 2010) | 2 lines Made scripts wait for all non-daemon threads to exit before calling System.exit. Closes #1955, #2006, #3408. Review by community. ........ r22188 | extempore | 2010-06-08 01:43:14 +0200 (Tue, 08 Jun 2010) | 4 lines Most of the iterate implementations were calling the given function one too many times, leading to tragic failure if the function could not handle this (such as repeatedly applying tail.) Closes #3540, review by prokopec. ........ r22189 | extempore | 2010-06-08 04:15:50 +0200 (Tue, 08 Jun 2010) | 4 lines Taking another shot at negative constants as annotation arguments since r22175 didn't quite get there. I call into the constant folder with the unfolded tree at the last point before it's going to fail the compile anyway. Closes #3521, review by odersky. ........ r22194 | michelou | 2010-06-08 13:13:04 +0200 (Tue, 08 Jun 2010) | 2 lines added/updated Android examples (cnt'd) ........ r22195 | extempore | 2010-06-08 16:35:16 +0200 (Tue, 08 Jun 2010) | 2 lines Fixed a regrettable oversight which was leaving temp files stacking up in templand, and a partial fix for #3519. No review. ........ r22196 | prokopec | 2010-06-08 18:17:58 +0200 (Tue, 08 Jun 2010) | 1 line Fixes #3461. No review.p ........ r22197 | michelou | 2010-06-08 18:52:51 +0200 (Tue, 08 Jun 2010) | 2 lines fixed setenv task (Android examples) ........ r22198 | extempore | 2010-06-08 21:03:56 +0200 (Tue, 08 Jun 2010) | 3 lines Put in some long overdue soft padding around repl completion so when it pokes around the compiler in a way which surprises something, we don't lose the repl. Closes #3548, no review. ........ r22199 | prokopec | 2010-06-09 09:56:13 +0200 (Wed, 09 Jun 2010) | 5 lines Added `combine` and `split` to immutable.HashMap. Under test/benchmarks there is a `bench` script to run benchmarks - it can be invoked after running building the library. Review by rompf. ........ r22211 | prokopec | 2010-06-10 10:58:07 +0200 (Thu, 10 Jun 2010) | 1 line HashMap merge bug fixed. No review ........ r22215 | prokopec | 2010-06-10 19:47:18 +0200 (Thu, 10 Jun 2010) | 1 line Continued working on hash trie map combine - work in progress. No review yet. ........ r22234 | prokopec | 2010-06-11 17:15:55 +0200 (Fri, 11 Jun 2010) | 2 lines Further improved combine for hash tries, cutting of another 30ms (160 downto 130). Review by rompf. ........ r22248 | michelou | 2010-06-12 20:53:45 +0200 (Sat, 12 Jun 2010) | 2 lines updated build scripts (Android examples) ........ r22249 | michelou | 2010-06-12 21:30:16 +0200 (Sat, 12 Jun 2010) | 2 lines moved README file (Android examples) ........ r22260 | extempore | 2010-06-13 18:16:47 +0200 (Sun, 13 Jun 2010) | 1 line Changed groupBy to return immutable.Map. Closes #3550, review by odersky. ........ r22261 | extempore | 2010-06-13 18:17:05 +0200 (Sun, 13 Jun 2010) | 2 lines Made getters treated more like private members when debating whether to inline. Closes #3420, review by dragos. ........ r22276 | dragos | 2010-06-14 14:18:13 +0200 (Mon, 14 Jun 2010) | 1 line Closes #3420, typo in scaladoc for BigInt. No review. ........
Diffstat (limited to 'docs/licenses')
-rw-r--r--docs/licenses/apache_android.txt16
-rw-r--r--docs/licenses/bsd_jline.txt34
-rw-r--r--docs/licenses/mit_jquery.txt13
-rw-r--r--docs/licenses/mit_sizzle.txt13
-rw-r--r--docs/licenses/mit_tools.tooltip.txt13
5 files changed, 89 insertions, 0 deletions
diff --git a/docs/licenses/apache_android.txt b/docs/licenses/apache_android.txt
new file mode 100644
index 0000000000..00f339625f
--- /dev/null
+++ b/docs/licenses/apache_android.txt
@@ -0,0 +1,16 @@
+Scala includes various example files for Android:
+
+Copyright (c) 2005-2009, The Android Open Source Project
+Copyright (c) 2007, Steven Osborn
+
+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
+
+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. \ No newline at end of file
diff --git a/docs/licenses/bsd_jline.txt b/docs/licenses/bsd_jline.txt
new file mode 100644
index 0000000000..4ac4a378ed
--- /dev/null
+++ b/docs/licenses/bsd_jline.txt
@@ -0,0 +1,34 @@
+Scala includes the jLine library:
+
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+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.
+
+Neither the name of JLine 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
+"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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
diff --git a/docs/licenses/mit_jquery.txt b/docs/licenses/mit_jquery.txt
new file mode 100644
index 0000000000..ef2c570469
--- /dev/null
+++ b/docs/licenses/mit_jquery.txt
@@ -0,0 +1,13 @@
+Scala includes the jQuery library:
+
+Copyright (c) 2010 John Resig
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
diff --git a/docs/licenses/mit_sizzle.txt b/docs/licenses/mit_sizzle.txt
new file mode 100644
index 0000000000..d81d30aa0f
--- /dev/null
+++ b/docs/licenses/mit_sizzle.txt
@@ -0,0 +1,13 @@
+Scala includes the Sizzle library:
+
+Copyright (c) 2010 The Dojo Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
diff --git a/docs/licenses/mit_tools.tooltip.txt b/docs/licenses/mit_tools.tooltip.txt
new file mode 100644
index 0000000000..27a4dbc788
--- /dev/null
+++ b/docs/licenses/mit_tools.tooltip.txt
@@ -0,0 +1,13 @@
+Scala includes the Tools Tooltip library:
+
+Copyright (c) 2009 Tero Piirainen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.