svn commit: r777832 - in /lucene/tika/trunk: LICENSE.txt NOTICE.txt

[ju...@apache.org]

Author: jukka
Date: Sat May 23 08:10:54 2009
New Revision: 777832

URL: http://svn.apache.org/viewvc?rev=777832&view=rev
Log:
TIKA-233: Inline the ICU4J charset detection logic

Need to note the inlined code also in the top-level licensing information.

Modified:
    lucene/tika/trunk/LICENSE.txt
    lucene/tika/trunk/NOTICE.txt

Modified: lucene/tika/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/LICENSE.txt?rev=777832&r1=777831&r2=777832&view=diff
==============================================================================
--- lucene/tika/trunk/LICENSE.txt (original)
+++ lucene/tika/trunk/LICENSE.txt Sat May 23 08:10:54 2009
@@ -239,3 +239,35 @@
     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.
+
+Charset detection code from ICU4J (http://site.icu-project.org/)
+
+    Copyright (c) 1995-2009 International Business Machines Corporation
+    and others
+
+    All rights reserved.
+
+    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, and/or sell copies of the Software, and to permit persons
+    to whom the Software is furnished to do so, provided that the above
+    copyright notice(s) and this permission notice appear in all copies
+    of the Software and that both the above copyright notice(s) and this
+    permission notice appear in supporting documentation.
+
+    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 AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+    IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+    BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+    OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+    WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+    SOFTWARE.
+
+    Except as contained in this notice, the name of a copyright holder shall
+    not be used in advertising or otherwise to promote the sale, use or other
+    dealings in this Software without prior written authorization of the
+    copyright holder.

Modified: lucene/tika/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/NOTICE.txt?rev=777832&r1=777831&r2=777832&view=diff
==============================================================================
--- lucene/tika/trunk/NOTICE.txt (original)
+++ lucene/tika/trunk/NOTICE.txt Sat May 23 08:10:54 2009
@@ -8,3 +8,5 @@
 
 Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
 Software written by Ian F. Darwin and others; maintained 1994- Christos Zoulas.
+
+Copyright (c) 1995-2009 International Business Machines Corporation and others