You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2008/06/19 00:16:17 UTC
svn commit: r669315 - in /incubator/tika/trunk: CHANGES.txt LICENSE.txt
NOTICE.txt src/main/assembly/LICENSE.txt src/main/assembly/NOTICE.txt
src/main/assembly/standalone.xml
Author: jukka
Date: Wed Jun 18 15:16:16 2008
New Revision: 669315
URL: http://svn.apache.org/viewvc?rev=669315&view=rev
Log:
TIKA-145: Separate NOTICEs and LICENSEs for binary and source packages
Added:
incubator/tika/trunk/src/main/assembly/LICENSE.txt (props changed)
- copied unchanged from r669307, incubator/tika/trunk/LICENSE.txt
incubator/tika/trunk/src/main/assembly/NOTICE.txt (props changed)
- copied unchanged from r669307, incubator/tika/trunk/NOTICE.txt
Modified:
incubator/tika/trunk/CHANGES.txt
incubator/tika/trunk/LICENSE.txt
incubator/tika/trunk/NOTICE.txt
incubator/tika/trunk/src/main/assembly/standalone.xml
Modified: incubator/tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/tika/trunk/CHANGES.txt?rev=669315&r1=669314&r2=669315&view=diff
==============================================================================
--- incubator/tika/trunk/CHANGES.txt (original)
+++ incubator/tika/trunk/CHANGES.txt Wed Jun 18 15:16:16 2008
@@ -55,6 +55,9 @@
23. TIKA-144 - Upgrade nekohtml dependency (Jukka Zitting)
+24. TIKA-145 - Separate NOTICEs and LICENSEs for binary and source packages
+ (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=669315&r1=669314&r2=669315&view=diff
==============================================================================
--- incubator/tika/trunk/LICENSE.txt (original)
+++ incubator/tika/trunk/LICENSE.txt Wed Jun 18 15:16:16 2008
@@ -200,125 +200,3 @@
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.
Modified: incubator/tika/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/tika/trunk/NOTICE.txt?rev=669315&r1=669314&r2=669315&view=diff
==============================================================================
--- incubator/tika/trunk/NOTICE.txt (original)
+++ incubator/tika/trunk/NOTICE.txt Wed Jun 18 15:16:16 2008
@@ -3,14 +3,3 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software developed by the following copyright owners:
-
-Copyright (c) 2000-2006 The Legion Of The Bouncy Castle
-(http://www.bouncycastle.org)
-
-Copyright (c) 2003-2005, www.pdfbox.org
-
-Copyright (c) 2003-2005, www.fontbox.org
-
-Copyright (c) 1995-2005 International Business Machines Corporation and others
Propchange: incubator/tika/trunk/src/main/assembly/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tika/trunk/src/main/assembly/LICENSE.txt
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/tika/trunk/src/main/assembly/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tika/trunk/src/main/assembly/NOTICE.txt
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/tika/trunk/src/main/assembly/standalone.xml
URL: http://svn.apache.org/viewvc/incubator/tika/trunk/src/main/assembly/standalone.xml?rev=669315&r1=669314&r2=669315&view=diff
==============================================================================
--- incubator/tika/trunk/src/main/assembly/standalone.xml (original)
+++ incubator/tika/trunk/src/main/assembly/standalone.xml Wed Jun 18 15:16:16 2008
@@ -22,9 +22,9 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
+ <directory>src/main/assembly</directory>
<outputDirectory>META-INF</outputDirectory>
<includes>
- <include>README.txt</include>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
</includes>