diff --git a/.classpath b/.classpath index e249e21fc..12a285d63 100644 --- a/.classpath +++ b/.classpath @@ -1,88 +1,89 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index df96aa707..68f7e0a51 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -61,19 +61,19 @@ $JAVAROOT/lib/J7Zip-modified.jar $JAVAROOT/lib/jakarta-oro-2.0.8.jar $JAVAROOT/lib/jaudiotagger-2.0.4-20111207.115108-15.jar - $JAVAROOT/lib/javax.servlet-3.0.0.v201112011016.jar $JAVAROOT/lib/jcifs-1.3.17.jar $JAVAROOT/lib/jcl-over-slf4j-1.7.2.jar $JAVAROOT/lib/jempbox-1.8.3.jar $JAVAROOT/lib/jena-2.6.4.jar - $JAVAROOT/lib/jetty-continuation-8.1.13.v20130916.jar - $JAVAROOT/lib/jetty-http-8.1.13.v20130916.jar - $JAVAROOT/lib/jetty-io-8.1.13.v20130916.jar - $JAVAROOT/lib/jetty-security-8.1.13.v20130916.jar - $JAVAROOT/lib/jetty-server-8.1.13.v20130916.jar - $JAVAROOT/lib/jetty-servlet-8.1.13.v20130916.jar - $JAVAROOT/lib/jetty-servlets-8.1.13.v20130916.jar - $JAVAROOT/lib/jetty-util-8.1.13.v20130916.jar + $JAVAROOT/lib/jetty-client-8.1.14.v20131031.jar + $JAVAROOT/lib/jetty-continuation-8.1.14.v20131031.jar + $JAVAROOT/lib/jetty-http-8.1.14.v20131031.jar + $JAVAROOT/lib/jetty-io-8.1.14.v20131031.jar + $JAVAROOT/lib/jetty-security-8.1.14.v20131031.jar + $JAVAROOT/lib/jetty-server-8.1.14.v20131031.jar + $JAVAROOT/lib/jetty-servlet-8.1.14.v20131031.jar + $JAVAROOT/lib/jetty-servlets-8.1.14.v20131031.jar + $JAVAROOT/lib/jetty-util-8.1.14.v20131031.jar $JAVAROOT/lib/jsch-0.1.50.jar $JAVAROOT/lib/json-simple-1.1.1.jar $JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar @@ -98,6 +98,7 @@ $JAVAROOT/lib/poi-3.9-20121203.jar $JAVAROOT/lib/poi-scratchpad-3.9-20121203.jar $JAVAROOT/lib/sax-2.0.1.jar + $JAVAROOT/lib/servlet-api-3.0.jar $JAVAROOT/lib/slf4j-api-1.7.2.jar $JAVAROOT/lib/slf4j-jdk14-1.7.2.jar $JAVAROOT/lib/solr-core-4.6.0.jar diff --git a/build.xml b/build.xml index bd653b54d..860bda48e 100644 --- a/build.xml +++ b/build.xml @@ -185,20 +185,19 @@ - - - - - - - - - - + + + + + + + + + @@ -224,6 +223,7 @@ + diff --git a/lib/jetty-8.1.14v20131031.License b/lib/jetty-8.1.14v20131031.License new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/lib/jetty-8.1.14v20131031.License @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. diff --git a/lib/jetty-client-8.1.13.v20130916.jar b/lib/jetty-client-8.1.14.v20131031.jar similarity index 62% rename from lib/jetty-client-8.1.13.v20130916.jar rename to lib/jetty-client-8.1.14.v20131031.jar index ffb8cef91..ef3b54f0c 100644 Binary files a/lib/jetty-client-8.1.13.v20130916.jar and b/lib/jetty-client-8.1.14.v20131031.jar differ diff --git a/lib/jetty-continuation-8.1.13.v20130916.jar b/lib/jetty-continuation-8.1.14.v20131031.jar similarity index 79% rename from lib/jetty-continuation-8.1.13.v20130916.jar rename to lib/jetty-continuation-8.1.14.v20131031.jar index 7d9990f75..43c75169f 100644 Binary files a/lib/jetty-continuation-8.1.13.v20130916.jar and b/lib/jetty-continuation-8.1.14.v20131031.jar differ diff --git a/lib/jetty-http-8.1.13.v20130916.jar b/lib/jetty-http-8.1.14.v20131031.jar similarity index 91% rename from lib/jetty-http-8.1.13.v20130916.jar rename to lib/jetty-http-8.1.14.v20131031.jar index e12cfe031..94f7c7c38 100644 Binary files a/lib/jetty-http-8.1.13.v20130916.jar and b/lib/jetty-http-8.1.14.v20131031.jar differ diff --git a/lib/jetty-io-8.1.13.v20130916.jar b/lib/jetty-io-8.1.14.v20131031.jar similarity index 82% rename from lib/jetty-io-8.1.13.v20130916.jar rename to lib/jetty-io-8.1.14.v20131031.jar index 51e527b15..75708326b 100644 Binary files a/lib/jetty-io-8.1.13.v20130916.jar and b/lib/jetty-io-8.1.14.v20131031.jar differ diff --git a/lib/jetty-security-8.1.13.v20130916.jar b/lib/jetty-security-8.1.14.v20131031.jar similarity index 89% rename from lib/jetty-security-8.1.13.v20130916.jar rename to lib/jetty-security-8.1.14.v20131031.jar index d1d7c2737..b03e81283 100644 Binary files a/lib/jetty-security-8.1.13.v20130916.jar and b/lib/jetty-security-8.1.14.v20131031.jar differ diff --git a/lib/jetty-server-8.1.13.v20130916.jar b/lib/jetty-server-8.1.14.v20131031.jar similarity index 72% rename from lib/jetty-server-8.1.13.v20130916.jar rename to lib/jetty-server-8.1.14.v20131031.jar index d2273bb16..d03aba100 100644 Binary files a/lib/jetty-server-8.1.13.v20130916.jar and b/lib/jetty-server-8.1.14.v20131031.jar differ diff --git a/lib/jetty-servlet-8.1.13.v20130916.jar b/lib/jetty-servlet-8.1.13.v20130916.jar deleted file mode 100644 index 4346d768c..000000000 Binary files a/lib/jetty-servlet-8.1.13.v20130916.jar and /dev/null differ diff --git a/lib/jetty-servlet-8.1.14.v20131031.jar b/lib/jetty-servlet-8.1.14.v20131031.jar new file mode 100644 index 000000000..1210e620d Binary files /dev/null and b/lib/jetty-servlet-8.1.14.v20131031.jar differ diff --git a/lib/jetty-servlets-8.1.13.v20130916.jar b/lib/jetty-servlets-8.1.14.v20131031.jar similarity index 90% rename from lib/jetty-servlets-8.1.13.v20130916.jar rename to lib/jetty-servlets-8.1.14.v20131031.jar index 44e30dcb9..0ab9e0abe 100644 Binary files a/lib/jetty-servlets-8.1.13.v20130916.jar and b/lib/jetty-servlets-8.1.14.v20131031.jar differ diff --git a/lib/jetty-util-8.1.13.v20130916.jar b/lib/jetty-util-8.1.14.v20131031.jar similarity index 91% rename from lib/jetty-util-8.1.13.v20130916.jar rename to lib/jetty-util-8.1.14.v20131031.jar index 86e4d881c..6fc403191 100644 Binary files a/lib/jetty-util-8.1.13.v20130916.jar and b/lib/jetty-util-8.1.14.v20131031.jar differ diff --git a/lib/javax.servlet-3.0.0.v201112011016.jar b/lib/servlet-api-3.0.jar similarity index 100% rename from lib/javax.servlet-3.0.0.v201112011016.jar rename to lib/servlet-api-3.0.jar diff --git a/nbproject/project.xml b/nbproject/project.xml index c2e23b092..e48cd1fe9 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -44,6 +44,11 @@ compile + + jar + lib/yacycore.jar + compile + @@ -73,7 +78,8 @@ source htroot - lib/J7Zip-modified.jar;lib/activation.jar;lib/apache-mime4j-0.6.jar;lib/arq-2.8.7.jar;lib/bcmail-jdk15-145.jar;lib/bcprov-jdk15-145.jar;lib/commons-codec-1.7.jar;lib/commons-compress-1.4.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-io-2.1.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.3.jar;lib/fontbox-1.8.3.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-15.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.1.jar;lib/httpcore-4.3.jar;lib/httpmime-4.3.1.jar;lib/icu4j-core.jar;lib/iri-0.8.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-3.0.0.v201112011016.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.2.jar;lib/jempbox-1.8.3.jar;lib/jena-2.6.4.jar;lib/jetty-client-8.1.13.v20130916.jar;lib/jetty-continuation-8.1.13.v20130916.jar;lib/jetty-http-8.1.13.v20130916.jar;lib/jetty-io-8.1.13.v20130916.jar;lib/jetty-security-8.1.13.v20130916.jar;lib/jetty-server-8.1.13.v20130916.jar;lib/jetty-servlet-8.1.13.v20130916.jar;lib/jetty-servlets-8.1.13.v20130916.jar;lib/jetty-util-8.1.13.v20130916.jar;lib/jsch-0.1.50.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.6.3.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.6.0.jar;lib/lucene-analyzers-phonetic-4.6.0.jar;lib/lucene-classification-4.6.0.jar;lib/lucene-codecs-4.6.0.jar;lib/lucene-core-4.6.0.jar;lib/lucene-facet-4.6.0.jar;lib/lucene-grouping-4.6.0.jar;lib/lucene-highlighter-4.6.0.jar;lib/lucene-join-4.6.0.jar;lib/lucene-memory-4.6.0.jar;lib/lucene-misc-4.6.0.jar;lib/lucene-queries-4.6.0.jar;lib/lucene-queryparser-4.6.0.jar;lib/lucene-spatial-4.6.0.jar;lib/lucene-suggest-4.6.0.jar;lib/metadata-extractor-2.6.2.jar;lib/noggit-0.5.jar;lib/pdfbox-1.8.3.jar;lib/poi-3.9-20121203.jar;lib/poi-scratchpad-3.9-20121203.jar;lib/sax-2.0.1.jar;lib/slf4j-api-1.7.2.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.6.0.jar;lib/solr-solrj-4.6.0.jar;lib/spatial4j-0.3.jar;lib/webcat-0.1-swf.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/zookeeper-3.4.5.jar + lib/J7Zip-modified.jar;lib/activation.jar;lib/apache-mime4j-0.6.jar;lib/arq-2.8.7.jar;lib/bcmail-jdk15-145.jar;lib/bcprov-jdk15-145.jar;lib/commons-codec-1.7.jar;lib/commons-compress-1.4.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-io-2.1.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.3.jar;lib/fontbox-1.8.3.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-15.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.1.jar;lib/httpcore-4.3.jar;lib/httpmime-4.3.1.jar;lib/icu4j-core.jar;lib/iri-0.8.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.2.jar;lib/jempbox-1.8.3.jar;lib/jena-2.6.4.jar;lib/jetty-client-8.1.14.v20131031.jar;lib/jetty-continuation-8.1.14.v20131031.jar;lib/jetty-http-8.1.14.v20131031.jar;lib/jetty-io-8.1.14.v20131031.jar;lib/jetty-security-8.1.14.v20131031.jar;lib/jetty-server-8.1.14.v20131031.jar;lib/jetty-servlet-8.1.14.v20131031.jar;lib/jetty-servlets-8.1.14.v20131031.jar;lib/jetty-util-8.1.14.v20131031.jar;lib/jsch-0.1.50.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.6.3.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.6.0.jar;lib/lucene-analyzers-phonetic-4.6.0.jar;lib/lucene-classification-4.6.0.jar;lib/lucene-codecs-4.6.0.jar;lib/lucene-core-4.6.0.jar;lib/lucene-facet-4.6.0.jar;lib/lucene-grouping-4.6.0.jar;lib/lucene-highlighter-4.6.0.jar;lib/lucene-join-4.6.0.jar;lib/lucene-memory-4.6.0.jar;lib/lucene-misc-4.6.0.jar;lib/lucene-queries-4.6.0.jar;lib/lucene-queryparser-4.6.0.jar;lib/lucene-spatial-4.6.0.jar;lib/lucene-suggest-4.6.0.jar;lib/metadata-extractor-2.6.2.jar;lib/noggit-0.5.jar;lib/pdfbox-1.8.3.jar;lib/poi-3.9-20121203.jar;lib/poi-scratchpad-3.9-20121203.jar;lib/sax-2.0.1.jar;lib/servlet-api-3.0.jar;lib/slf4j-api-1.7.2.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.6.0.jar;lib/solr-solrj-4.6.0.jar;lib/spatial4j-0.3.jar;lib/webcat-0.1-swf.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/zookeeper-3.4.5.jar + lib/yacycore.jar 1.6