You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by tw...@apache.org on 2009/09/03 16:11:18 UTC
svn commit: r810955 - in /incubator/uima/sandbox/trunk/BSFAnnotator:
LICENSE.txt NOTICE.txt
Author: twgoetz
Date: Thu Sep 3 14:11:18 2009
New Revision: 810955
URL: http://svn.apache.org/viewvc?rev=810955&view=rev
Log:
UIMA-1546: update BSFAnnotator notice and license files.
https://issues.apache.org/jira/browse/UIMA-1546
Modified:
incubator/uima/sandbox/trunk/BSFAnnotator/LICENSE.txt
incubator/uima/sandbox/trunk/BSFAnnotator/NOTICE.txt
Modified: incubator/uima/sandbox/trunk/BSFAnnotator/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/BSFAnnotator/LICENSE.txt?rev=810955&r1=810954&r2=810955&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/BSFAnnotator/LICENSE.txt (original)
+++ incubator/uima/sandbox/trunk/BSFAnnotator/LICENSE.txt Thu Sep 3 14:11:18 2009
@@ -203,6 +203,8 @@
limitations under the License.
+For bsh-1.3.0.jar:
+
------------------------------- Sun Public License, v. 1.0 ---------------------------------
1. Definitions.
@@ -711,6 +713,9 @@
Original Code Source Code for Your Modifications.]
+
+For bsf.jar:
+
------------------------------ MPL 1.1 -------------------------------------------------
MOZILLA PUBLIC LICENSE
Modified: incubator/uima/sandbox/trunk/BSFAnnotator/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/BSFAnnotator/NOTICE.txt?rev=810955&r1=810954&r2=810955&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/BSFAnnotator/NOTICE.txt (original)
+++ incubator/uima/sandbox/trunk/BSFAnnotator/NOTICE.txt Thu Sep 3 14:11:18 2009
@@ -6,7 +6,7 @@
This software also includes:
- - Beanshell, lightweight Scripting for Java, from http://www.beanshell.org/,
+ - Beanshell 1.3.0, lightweight Scripting for Java, from http://www.beanshell.org/,
licensed under the Sun Public License/LGPL. Distributed here under the
SPL, see LICENSE.txt.
@@ -14,25 +14,6 @@
http://www.mozilla.org/rhino/, available under MPL 1.1/GPL 2.0 license. Distributed here
under the MPL 1.1, see LICENSE.txt.
-The Jar files in the /lib directory were obtained from, and are licensed as follows:
-
- > bsf.jar: Apache 2 license; Comes from http://apache.crihan.fr/dist/jakarta/bsf/binaries/bsf-bin-2.4.0.zip
-
- > bsh-1.3.0.jar: Dual licensed under both the SPL (Sun Public License) and LGPL => SPL is in the list of
- acceptable licenses available here: http://www.apache.org/legal/3party.html
- From http://www.beanshell.org/bsh-1.3.0.jar (also now
- contains the bsh-bsf.jar classes)
-
- > commons-logging-api-1.1.jar: Apache 2 license; Comes from
- http://archive.apache.org/dist/commons/logging/binaries/commons-logging-1.1.zip
-
- > js.jar Dual licensed under both the MPL 1.1 and GPL => MPL is in the list of
- acceptable licenses available here: http://www.apache.org/legal/3party.html
- From ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R7.zip
-
- > log4j-1.2.15.jar Apache 2 license; Comes from
- http://www.apache.org/dyn/closer.cgi/logging/log4j/1.2.15/apache-log4j-1.2.15.zip
-