svn commit: r827932 - in /incubator/pdfbox/jempbox/trunk: LICENSE.txt NOTICE.txt src/main/appended-resources/ src/main/appended-resources/META-INF/ src/main/appended-resources/META-INF/LICENSE src/main/appended-resources/META-INF/NOTICE

[ju...@apache.org]

Author: jukka
Date: Wed Oct 21 09:11:17 2009
New Revision: 827932

URL: http://svn.apache.org/viewvc?rev=827932&view=rev
Log:
PDFBOX-500: Add the license metadata to be included in the binary jar (unfortunately duplicating information from project root).

Added:
    incubator/pdfbox/jempbox/trunk/src/main/appended-resources/
    incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/
    incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/LICENSE   (with props)
    incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/NOTICE   (with props)
Modified:
    incubator/pdfbox/jempbox/trunk/LICENSE.txt
    incubator/pdfbox/jempbox/trunk/NOTICE.txt

Modified: incubator/pdfbox/jempbox/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/pdfbox/jempbox/trunk/LICENSE.txt?rev=827932&r1=827931&r2=827932&view=diff
==============================================================================
--- incubator/pdfbox/jempbox/trunk/LICENSE.txt (original)
+++ incubator/pdfbox/jempbox/trunk/LICENSE.txt Wed Oct 21 09:11:17 2009
@@ -202,13 +202,9 @@
    limitations under the License.
 
 
-EXTERNAL COMPONENTS
+CONTRIBUTIONS TO THE ORIGINAL CODEBASE
 
-Apache JempBox includes a number of components with separate copyright notices
-and license terms. Your use of these components is subject to the terms and
-conditions of the following licenses.
-
-Contributions made to the original JempBox project at www.jempbox.org:
+Apache JempBox is based on contributions made to the original JempBox project:
 
    Copyright (c) 2006-2007, www.jempbox.org
    All rights reserved.

Modified: incubator/pdfbox/jempbox/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/pdfbox/jempbox/trunk/NOTICE.txt?rev=827932&r1=827931&r2=827932&view=diff
==============================================================================
--- incubator/pdfbox/jempbox/trunk/NOTICE.txt (original)
+++ incubator/pdfbox/jempbox/trunk/NOTICE.txt Wed Oct 21 09:11:17 2009
@@ -4,5 +4,5 @@
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-Based on source code originally developed at www.jempbox.org.
+Based on source code contributed to the original JempBox project.
 Copyright (c) 2006-2007, www.jempbox.org

Added: incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/LICENSE?rev=827932&view=auto
==============================================================================
--- incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/LICENSE (added)
+++ incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/LICENSE Wed Oct 21 09:11:17 2009
@@ -0,0 +1,34 @@
+
+CONTRIBUTIONS TO THE ORIGINAL CODEBASE
+
+Apache JempBox is based on contributions made to the original JempBox project:
+
+   Copyright (c) 2006-2007, www.jempbox.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.
+

Propchange: incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/NOTICE?rev=827932&view=auto
==============================================================================
--- incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/NOTICE (added)
+++ incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/NOTICE Wed Oct 21 09:11:17 2009
@@ -0,0 +1,2 @@
+Based on source code contributed to the original JempBox project.
+Copyright (c) 2006-2007, www.jempbox.org

Propchange: incubator/pdfbox/jempbox/trunk/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native