Author: jukka
Date: Mon Jan 21 15:04:54 2008
New Revision: 614041
URL: http://svn.apache.org/viewvc?rev=614041&view=rev
Log:
TIKA-115: Tika package with all the dependencies
- The bin assembly now contains all runtime dependencies
- Reviewed the dependency licenses and updated the
NOTICE and LICENSE files accordingly
Modified:
incubator/tika/trunk/CHANGES.txt
incubator/tika/trunk/LICENSE.txt
incubator/tika/trunk/NOTICE.txt
incubator/tika/trunk/README.txt
incubator/tika/trunk/src/main/assembly/bin.xml
Modified: incubator/tika/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/CHANGES.txt?rev=614041&r1=614040&r2=614041&view=diff
==============================================================================
--- incubator/tika/trunk/CHANGES.txt (original)
+++ incubator/tika/trunk/CHANGES.txt Mon Jan 21 15:04:54 2008
@@ -11,6 +11,8 @@
4. TIKA-117 - Drop JDOM and Jaxen dependencies (Jukka Zitting)
+5. TIKA-115 - Tika package with all the dependencies (Jukka Zitting)
+
Release 0.1-incubating - 12/27/2007
1. TIKA-5 - Port Metadata Framework from Nutch (mattmann)
Modified: incubator/tika/trunk/LICENSE.txt
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/LICENSE.txt?rev=614041&r1=614040&r2=614041&view=diff
==============================================================================
--- incubator/tika/trunk/LICENSE.txt (original)
+++ incubator/tika/trunk/LICENSE.txt Mon Jan 21 15:04:54 2008
@@ -200,3 +200,175 @@
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.
+
+
+
+APACHE TIKA SUBCOMPONENTS
+
+Apache Tika includes a number of subcomponents with separate copyright notices
+and license terms. Your use of these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+Bouncy Castle libraries (bcmail and bcprov)
+
+ Copyright (c) 2000-2006 The Legion Of The Bouncy Castle
+ (http://www.bouncycastle.org)
+
+ 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.
+
+ 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. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+PDFBox library (pdfbox)
+
+ Copyright (c) 2003-2005, www.pdfbox.org
+ All rights reserved.
+
+ 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 pdfbox; 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 REGENTS 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.
+
+FontBox and JempBox libraries (fontbox, jempbox)
+
+ Copyright (c) 2003-2005, www.fontbox.org
+ All rights reserved.
+
+ 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 fontbox; 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 REGENTS 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.
+
+ICU4J library (icu4j)
+
+ Copyright (c) 1995-2005 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.
+
+CyberNeko HTML Parser library (nekohtml)
+
+ The CyberNeko Software License, Version 1.0
+
+ (C) Copyright 2002-2005, Andy Clark. All rights reserved.
+
+ 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. The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgment:
+ "This product includes software developed by Andy Clark."
+ Alternately, this acknowledgment may appear in the software itself,
+ if and wherever such third-party acknowledgments normally appear.
+
+ 4. The names "CyberNeko" and "NekoHTML" must not be used to endorse
+ or promote products derived from this software without prior
+ written permission. For written permission, please contact
+ [EMAIL PROTECTED]
+
+ 5. Products derived from this software may not be called "CyberNeko",
+ nor may "CyberNeko" appear in their name, without prior written
+ permission of the author.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 OR OTHER 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.
+
+ ====================================================================
+
+ This license is based on the Apache Software License, version 1.1.
+
Modified: incubator/tika/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/NOTICE.txt?rev=614041&r1=614040&r2=614041&view=diff
==============================================================================
--- incubator/tika/trunk/NOTICE.txt (original)
+++ incubator/tika/trunk/NOTICE.txt Mon Jan 21 15:04:54 2008
@@ -1,10 +1,33 @@
Apache Tika
-Copyright 2007 The Apache Software Foundation
+Copyright 2007-2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+This software contains code written by Ryan Ackley. Please go to
+http://www.textmining.org for the latest version.
+
+ Copyright 2004 Ryan Ackley
+
+This product includes software developed by The Legion Of The Bouncy Castle:
+
+ Copyright (c) 2000-2006 The Legion Of The Bouncy Castle
+ (http://www.bouncycastle.org)
+
+This product includes software developed by the PDFBox project:
+
+ Copyright (c) 2003-2005, www.pdfbox.org
+
+This product includes software developed by the FontBox and JempBox projects:
+
+ Copyright (c) 2003-2005, www.fontbox.org
+
+This product includes software developed by the International Business
+Machines Corporation and others:
+
+ Copyright (c) 1995-2005 International Business Machines Corporation
+ and others
+
This product includes software developed by Andy Clark.
-This software contains code written by Ryan Ackley.
-Please go to http://www.textmining.org for the latest version.
+ (C) Copyright 2002-2005, Andy Clark.
Modified: incubator/tika/trunk/README.txt
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/README.txt?rev=614041&r1=614040&r2=614041&view=diff
==============================================================================
--- incubator/tika/trunk/README.txt (original)
+++ incubator/tika/trunk/README.txt Mon Jan 21 15:04:54 2008
@@ -21,7 +21,7 @@
License (see also LICENSE.txt)
==============================
-Collective work: Copyright 2007 The Apache Software Foundation.
+Collective work: Copyright 2007-2008 The Apache Software Foundation.
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -37,6 +37,10 @@
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.
+
+Apache Tika includes a number of subcomponents with separate copyright
+notices and license terms. Your use of these subcomponents is subject to
+the terms and conditions of the licenses listed in the LICENSE.txt file.
Building Tika
=============
Modified: incubator/tika/trunk/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/src/main/assembly/bin.xml?rev=614041&r1=614040&r2=614041&view=diff
==============================================================================
--- incubator/tika/trunk/src/main/assembly/bin.xml (original)
+++ incubator/tika/trunk/src/main/assembly/bin.xml Mon Jan 21 15:04:54 2008
@@ -21,6 +21,12 @@
<format>zip</format>
</formats>
<includeSiteDirectory>false</includeSiteDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
<fileSets>
<fileSet>
<includes>
@@ -32,7 +38,7 @@
</fileSet>
<fileSet>
<directory>target</directory>
- <outputDirectory/>
+ <outputDirectory>lib</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
