Author: jukka
Date: Mon Jun 16 09:32:18 2008
New Revision: 668226
URL: http://svn.apache.org/viewvc?rev=668226&view=rev
Log:
SLING-539: Merge LICENSE.* information to LICENSE files
- PDFBox license
Removed:
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/META-INF/LICENSE.pdfbox
incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE.pdfbox
incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE.pdfbox
Modified:
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/META-INF/LICENSE
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/META-INF/NOTICE
incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE
incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE
incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE
incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE
Modified:
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/META-INF/LICENSE?rev=668226&r1=668225&r2=668226&view=diff
==============================================================================
---
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/META-INF/LICENSE
(original)
+++
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/META-INF/LICENSE
Mon Jun 16 09:32:18 2008
@@ -200,3 +200,41 @@
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 SLING SUBCOMPONENTS:
+
+Apache Sling includes subcomponents with separate copyright notices and
+license terms. Your use of these subcomponents is subject to the terms
+and conditions of the following licenses.
+
+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.
Modified:
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/META-INF/NOTICE?rev=668226&r1=668225&r2=668226&view=diff
==============================================================================
---
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/META-INF/NOTICE
(original)
+++
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/META-INF/NOTICE
Mon Jun 16 09:32:18 2008
@@ -12,8 +12,8 @@
(Massachusetts Institute of Technology, Institut National de
Recherche en Informatique et en Automatique, Keio University).
-This product includes software developed at pdfbox.org,
-licensed under the BSD License.
+This product includes software developed at pdfbox.org.
+Copyright (c) 2003-2005, www.pdfbox.org
This software contains code written by Ryan Ackley.
Please go to http://www.textmining.org for the latest version.
Modified:
incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE?rev=668226&r1=668225&r2=668226&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE
(original)
+++ incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE Mon
Jun 16 09:32:18 2008
@@ -875,3 +875,34 @@
the notices in the Source Code files of the Original Code. You should
use the text of this Exhibit A rather than the text found in the
Original Code Source Code for Your Modifications.]
+
+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.
Modified: incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE?rev=668226&r1=668225&r2=668226&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE
(original)
+++ incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE Mon
Jun 16 09:32:18 2008
@@ -33,8 +33,8 @@
(Massachusetts Institute of Technology, Institut National de
Recherche en Informatique et en Automatique, Keio University).
-This product includes software developed at pdfbox.org,
-licensed under the BSD License.
+This product includes software developed at pdfbox.org.
+Copyright (c) 2003-2005, www.pdfbox.org
This software contains code written by Ryan Ackley.
Please go to http://www.textmining.org for the latest version.
Modified: incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE?rev=668226&r1=668225&r2=668226&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE
(original)
+++ incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE Mon
Jun 16 09:32:18 2008
@@ -875,3 +875,34 @@
the notices in the Source Code files of the Original Code. You should
use the text of this Exhibit A rather than the text found in the
Original Code Source Code for Your Modifications.]
+
+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.
Modified: incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE?rev=668226&r1=668225&r2=668226&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE
(original)
+++ incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE Mon
Jun 16 09:32:18 2008
@@ -30,8 +30,8 @@
(Massachusetts Institute of Technology, Institut National de
Recherche en Informatique et en Automatique, Keio University).
-This product includes software developed at pdfbox.org,
-licensed under the BSD License.
+This product includes software developed at pdfbox.org.
+Copyright (c) 2003-2005, www.pdfbox.org
This software contains code written by Ryan Ackley.
Please go to http://www.textmining.org for the latest version.
