summaryrefslogtreecommitdiff
path: root/docs/licenses
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-09-01 15:34:28 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-09-01 15:34:28 +0000
commita5a958146507482866c8ac9dca4210b1e8a21391 (patch)
tree5ed1f56da0872b81fbd129604493cf1f9aeba3ba /docs/licenses
parent05676863c18d70e3b5c979ebe2f04000305e41cd (diff)
downloadscala-a5a958146507482866c8ac9dca4210b1e8a21391.tar.gz
scala-a5a958146507482866c8ac9dca4210b1e8a21391.tar.bz2
scala-a5a958146507482866c8ac9dca4210b1e8a21391.zip
Merged revisions 22130-22131,22137,22140,22149,...
Merged revisions 22130-22131,22137,22140,22149,22285,22297-22298,22315,22355,22358,22361- 22362,22418,22475-22476,22481,22498-22501,22573-22574,22584,22587-22588, 22594,22604-22608,22614,22618-22619,22634,22636,22643,22650,22672,22674, 22739-22740,22798-22799 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ 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. ........ 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. ........ r22285 | dubochet | 2010-06-14 16:10:43 +0200 (Mon, 14 Jun 2010) | 1 line Added test case for #432. No review. ........ r22297 | dubochet | 2010-06-15 18:08:57 +0200 (Tue, 15 Jun 2010) | 1 line [scaladoc] Slightly more robust treatment of "code" HTML elements in Scaladoc comments. No review. ........ r22298 | dubochet | 2010-06-15 18:09:36 +0200 (Tue, 15 Jun 2010) | 1 line [scaladoc] New display mode for members: ordered by inheritance class. Review by malayeri. ........ r22315 | dubochet | 2010-06-16 16:16:31 +0200 (Wed, 16 Jun 2010) | 1 line [Scaladoc] Self types are printed. Contributed by Manohar Jonnalagedda. Checked by dubochet. ........ r22355 | dubochet | 2010-06-18 14:59:39 +0200 (Fri, 18 Jun 2010) | 1 line [scaladoc] Added linear super types. Review by cunei. ........ r22358 | dubochet | 2010-06-18 17:34:35 +0200 (Fri, 18 Jun 2010) | 3 lines [scaladoc] There is a text filter tool for members (searching on member name and comment body). Adds button to reset text filter tool. No review. Known limitation: filtering of members is blocking on keystroke leading to sluggish performance on large classes. Scheduler from index needs to be used for member filtering. ........ r22361 | dubochet | 2010-06-18 18:48:05 +0200 (Fri, 18 Jun 2010) | 1 line [scaladoc] Abstract members can be filtered in or out. Pointer icons are less crazy. Review by dubochet. Contributed by Pedro Furlanetto. ........ r22362 | dubochet | 2010-06-18 18:48:34 +0200 (Fri, 18 Jun 2010) | 1 line [scaladoc] A warning is printed when usecase members have different names than the real member being commented. Review by odersky. Contributed by Pedro Furlanetto. ........ r22418 | michelou | 2010-06-29 16:00:36 +0200 (Tue, 29 Jun 2010) | 2 lines removed warnings (deprecation,unchecked) ........ r22475 | dubochet | 2010-07-02 18:38:29 +0200 (Fri, 02 Jul 2010) | 1 line Closes #1766 (structural method dispatch broken in class with multiple constructors). Review by prokopec. ........ r22476 | dubochet | 2010-07-02 20:12:33 +0200 (Fri, 02 Jul 2010) | 1 line Closes #2318 (spurious IllegalAccessException thrown by some structural calls, caused by Java bug 4071957). Review by malayeri. ........ r22481 | extempore | 2010-07-03 02:56:00 +0200 (Sat, 03 Jul 2010) | 4 lines When compilation fails because of an unimplemented abstract var, give a more precise error message about what happened. Also avoid issuing the same error twice because neither getter nor setter is implemented. Closes #36, review by rytz. ........ r22498 | dubochet | 2010-07-06 18:07:31 +0200 (Tue, 06 Jul 2010) | 1 line [scaladoc] Implements documentation of higher-kinded entities. Closes #3618. Review by moors. ........ r22499 | dubochet | 2010-07-06 18:21:00 +0200 (Tue, 06 Jul 2010) | 1 line [scaladoc] Hiding full comments in template pages at startup is done by CSS instead of JavaScript, leading to better performance. Contributed by Pedro Furlanetto. Review by dubochet. ........ r22500 | dubochet | 2010-07-06 18:29:38 +0200 (Tue, 06 Jul 2010) | 1 line [scaladoc] Follow-up on review SCL-95. No review. ........ r22501 | dubochet | 2010-07-06 18:39:31 +0200 (Tue, 06 Jul 2010) | 1 line [scaladoc] Follow-up on review SCL-110. No review. ........ r22573 | dubochet | 2010-07-15 16:13:03 +0200 (Thu, 15 Jul 2010) | 1 line [scaladoc] Full comments with "by inheritance" ordering are correctly displayed. No review. ........ r22574 | dubochet | 2010-07-15 16:13:38 +0200 (Thu, 15 Jul 2010) | 1 line [scaladoc] Scaladoc knows about Javadoc inline tags and transforms them. The transformation is currently quite basic, particularly for links. Review by malayeri. ........ r22584 | dubochet | 2010-07-18 17:59:14 +0200 (Sun, 18 Jul 2010) | 1 line [scaladoc] Print "Inherited from" headings using type instances ("SeqLike[A, List[A]]") instead of template names ("SeqLike"). Review by malayeri. ........ r22587 | dubochet | 2010-07-19 11:38:25 +0200 (Mon, 19 Jul 2010) | 1 line [scaladoc] Adds private Scaladoc option "-Yuse-stupid-types" for LAMP internal use. No review. ........ r22588 | dubochet | 2010-07-19 13:57:51 +0200 (Mon, 19 Jul 2010) | 1 line [scaladoc] Fixes an issue whereas inherited members in objects would not see their types instantiated properly. No review. ........ r22594 | dubochet | 2010-07-19 17:11:30 +0200 (Mon, 19 Jul 2010) | 1 line [scaladoc] Singleton types (`this.type`) are correctly printed. Closes #1445. Review by malayeri. ........ r22604 | malayeri | 2010-07-20 18:13:28 +0200 (Tue, 20 Jul 2010) | 1 line [scaladoc] Modify build script to copy html resources to output directory; display template in a frame rather than an iframe; change title of main page when new frame is loaded. Review by dubochet. ........ r22605 | malayeri | 2010-07-20 18:14:32 +0200 (Tue, 20 Jul 2010) | 1 line [scaladoc] Make a DocDef node for javadoc comments in Java source files. ........ r22606 | malayeri | 2010-07-20 18:15:54 +0200 (Tue, 20 Jul 2010) | 1 line [scaladoc] Remove unused template.html file. ........ r22607 | malayeri | 2010-07-20 18:17:35 +0200 (Tue, 20 Jul 2010) | 1 line [scaladoc] Don't generate documentation for empty Java companion objects. No review. ........ r22608 | malayeri | 2010-07-20 18:18:54 +0200 (Tue, 20 Jul 2010) | 1 line [scaladoc] Optionally run typer phase for Java files, if createJavadoc method returns true. No review. ........ r22614 | dubochet | 2010-07-21 18:35:26 +0200 (Wed, 21 Jul 2010) | 1 line [docs] The first comment contributed using Petr Hošek's Colladoc. ........ r22618 | malayeri | 2010-07-22 11:21:37 +0200 (Thu, 22 Jul 2010) | 1 line [scaladoc] Fix performance problem when generating Scaladoc. ........ r22619 | malayeri | 2010-07-22 11:48:12 +0200 (Thu, 22 Jul 2010) | 1 line Revert 22605 change to JavaParsers.scala, which modified parsing behavior and broke jvm test t3415. No longer create DocDef nodes for Javadoc comments in Java source files. No review. ........ r22634 | dubochet | 2010-07-27 18:33:35 +0200 (Tue, 27 Jul 2010) | 1 line [scaladoc] Setting for link to source URLs is much more flexible and should allow satisfying Toni's exacting demands. Review by cunei. ........ r22636 | dubochet | 2010-07-28 13:26:15 +0200 (Wed, 28 Jul 2010) | 1 line [docs] Documentation updates contributed through Colladoc. No review. ........ r22643 | dubochet | 2010-07-28 18:23:55 +0200 (Wed, 28 Jul 2010) | 1 line [scaladoc] Small fixes for 2.8.0 updated documentation: window title contains version number, authors are not displayed (like in Javadoc), source links have correct title. No review. ........ r22650 | dubochet | 2010-07-30 13:51:25 +0200 (Fri, 30 Jul 2010) | 1 line Fixes an issue in RefChecks when the compiler does not have an erasure phase (such as in Scaladoc), which became visible after r22644. Review by odersky. ........ r22672 | chrisJames | 2010-08-04 14:32:01 +0200 (Wed, 04 Aug 2010) | 4 lines [Scaladoc] Prints default Values, considers anyRef as a class. closes #3105. Review by prokopec. ........ r22674 | dubochet | 2010-08-04 16:54:10 +0200 (Wed, 04 Aug 2010) | 1 line Keyword of method symbol signature is correctly printed as 'def' instead of 'val'. No review. ........ r22739 | chrisJames | 2010-08-12 13:58:52 +0200 (Thu, 12 Aug 2010) | 4 lines [Scaladoc] Improve the documentation of primary constructor. Adds a @constructor for commenting the primary constructor. It also adds some comments for the primary constructor (@params, @deprecated) which are initialised in the class comment. Members that come from primary constructor parameters (val parameters or parameters of a case class) are listed as members with the comment given using the @param tag (closes #254, closes #577). Case class signature now begins by 'case class' instead of 'class'. Review by dubochet ........ r22740 | chrisJames | 2010-08-12 13:59:21 +0200 (Thu, 12 Aug 2010) | 2 lines [Scaladoc] Fixes a bug in defaultValues display ('new A' now creates a link on A). Review by dubochet ........ r22798 | dubochet | 2010-08-19 16:04:09 +0200 (Thu, 19 Aug 2010) | 6 lines [scaladoc] Merges Petr's change to Scaladoc from the Colladoc branch: bugfixes, improvements and refactorings that make it possible to extends Scaladoc into Colladoc. - Layout of index uses jQuery UI panel instead of frameset. - Search boxes have correct width on Firefox. - Scaladoc models the original, untransformed source. - Various internal bugfixes & refactorings. Review by dubochet. ........ r22799 | dubochet | 2010-08-19 16:28:46 +0200 (Thu, 19 Aug 2010) | 1 line Fixed build for Java 1.5. No review. ........
Diffstat (limited to 'docs/licenses')
-rw-r--r--docs/licenses/apache_android.txt16
-rw-r--r--docs/licenses/apache_ant.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
6 files changed, 105 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/apache_ant.txt b/docs/licenses/apache_ant.txt
new file mode 100644
index 0000000000..ac637d760d
--- /dev/null
+++ b/docs/licenses/apache_ant.txt
@@ -0,0 +1,16 @@
+Scala includes Ant as a library needed for build with sbt
+
+Copyright © 1999-2010, The Apache Software Foundation.
+ http://ant.apache.org/
+
+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.
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.