Skip to content
Permalink
Browse files

Merge pull request #4 from yacy/master

Fork update #4
  • Loading branch information...
otteresk committed Sep 25, 2018
2 parents 0c4db9e + 6c3e140 commit 3c65a158e1cde50c3c2cb8a8072787c732414f08
Showing 492 changed files with 22,795 additions and 5,950 deletions.
@@ -22,88 +22,90 @@
<classpathentry kind="lib" path="lib/commons-fileupload-1.3.3.jar"/>
<classpathentry kind="lib" path="lib/json-simple-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/xml-apis.jar"/>
<classpathentry kind="lib" path="lib/commons-compress-1.14.jar"/>
<classpathentry kind="lib" path="lib/commons-compress-1.17.jar"/>
<classpathentry kind="lib" path="lib/xz-1.8.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="lib/jaudiotagger-2.0.4-20111207.115108-15.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.10.jar"/>
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.24.jar"/>
<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.24.jar"/>
<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.24.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.4.6.jar"/>
<classpathentry kind="lib" path="lib/metadata-extractor-2.10.1.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.11.jar"/>
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.25.jar"/>
<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.25.jar"/>
<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.25.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.4.9.jar"/>
<classpathentry kind="lib" path="lib/metadata-extractor-2.11.0.jar"/>
<classpathentry kind="lib" path="lib/xmpcore-5.1.3.jar"/>
<classpathentry kind="lib" path="lib/jcifs-1.3.17.jar"/>
<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
<classpathentry kind="lib" path="lib/org.restlet.jar"/>
<classpathentry kind="lib" path="lib/fontbox-2.0.7.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-2.0.7.jar"/>
<classpathentry kind="lib" path="lib/bcmail-jdk15-1.46.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk15-1.46.jar"/>
<classpathentry kind="lib" path="lib/poi-3.16.jar"/>
<classpathentry kind="lib" path="lib/poi-scratchpad-3.16.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.5.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.24.jar"/>
<classpathentry kind="lib" path="lib/fontbox-2.0.11.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-2.0.11.jar"/>
<classpathentry kind="lib" path="lib/bcmail-jdk15on-1.60.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk15on-1.60.jar"/>
<classpathentry kind="lib" path="lib/bcpkix-jdk15on-1.60.jar"/>
<classpathentry kind="lib" path="lib/poi-3.17.jar"/>
<classpathentry kind="lib" path="lib/poi-scratchpad-3.17.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.6.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.25.jar"/>
<classpathentry kind="lib" path="lib/chardet.jar"/>
<classpathentry kind="lib" path="lib/jetty-client-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-continuation-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-deploy-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-http-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-io-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-jmx-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-proxy-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-security-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-server-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlet-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlets-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-webapp-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/jetty-xml-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.5.3.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.5.3.jar"/>
<classpathentry kind="lib" path="lib/jetty-client-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-continuation-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-deploy-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-http-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-io-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-jmx-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-proxy-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-security-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-server-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlet-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlets-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-webapp-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/jetty-xml-9.4.12.v20180830.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.5.5.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.5.5.jar"/>
<classpathentry kind="lib" path="lib/noggit-0.6.jar"/>
<classpathentry kind="lib" path="lib/stax2-api-3.1.4.jar"/>
<classpathentry kind="lib" path="lib/woodstox-core-asl-4.4.1.jar"/>
<classpathentry kind="lib" path="lib/apache-mime4j-0.6.jar"/>
<classpathentry kind="lib" path="lib/commons-math3-3.4.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-backward-codecs-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-extras-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/solr-core-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-6.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-backward-codecs-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-extras-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/solr-core-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-6.6.5.jar"/>
<classpathentry kind="lib" path="lib/zookeeper-3.4.10.jar"/>
<classpathentry kind="lib" path="lib/metrics-core-3.2.2.jar"/>
<classpathentry kind="lib" path="lib/spatial4j-0.6.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/icu4j-59_1.jar"/>
<classpathentry kind="lib" path="lib/icu4j-62.1.jar"/>
<classpathentry kind="lib" path="lib/htmllexer.jar"/>
<classpathentry kind="lib" path="lib/jsoup-1.10.3.jar"/>
<classpathentry kind="lib" path="lib/jsoup-1.11.3.jar"/>
<classpathentry kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
<classpathentry kind="lib" path="lib/weupnp-0.1.4.jar"/>
<classpathentry kind="lib" path="lib/common-image-3.3.1.jar"/>
<classpathentry kind="lib" path="lib/common-io-3.3.1.jar"/>
<classpathentry kind="lib" path="lib/common-lang-3.3.1.jar"/>
<classpathentry kind="lib" path="lib/imageio-core-3.3.1.jar"/>
<classpathentry kind="lib" path="lib/imageio-metadata-3.3.1.jar"/>
<classpathentry kind="lib" path="lib/imageio-tiff-3.3.1.jar"/>
<classpathentry kind="lib" path="lib/imageio-bmp-3.3.1.jar"/>
<classpathentry kind="lib" path="lib/common-image-3.3.2.jar"/>
<classpathentry kind="lib" path="lib/common-io-3.3.2.jar"/>
<classpathentry kind="lib" path="lib/common-lang-3.3.2.jar"/>
<classpathentry kind="lib" path="lib/imageio-core-3.3.2.jar"/>
<classpathentry kind="lib" path="lib/imageio-metadata-3.3.2.jar"/>
<classpathentry kind="lib" path="lib/imageio-tiff-3.3.2.jar"/>
<classpathentry kind="lib" path="lib/imageio-bmp-3.3.2.jar"/>
<classpathentry kind="lib" path="lib/jsonic-1.3.10.jar"/>
<classpathentry kind="lib" path="lib/langdetect.jar"/>
<classpathentry kind="lib" path="lib/jwat-common-1.1.0.jar"/>
<classpathentry kind="lib" path="lib/jwat-gzip-1.1.0.jar"/>
<classpathentry kind="lib" path="lib/jwat-archive-common-1.1.0.jar"/>
<classpathentry kind="lib" path="lib/jwat-warc-1.1.0.jar"/>
<classpathentry kind="lib" path="lib/jwat-common-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/jwat-gzip-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/jwat-archive-common-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/jwat-warc-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-collections4-4.1.jar"/>
<classpathentry kind="lib" path="lib/jaudiotagger-2.2.5.jar"/>
<classpathentry kind="output" path="gen"/>
</classpath>
@@ -0,0 +1,18 @@
# YaCy contributor guidelines

Thank you for contributing to YaCy!
We appreciate all contributions, no matter how small.

Please create a pull request.

Some tips to make it more likely for your pull request to be accepted:

- Don't make big changes without discussing it first.
- Don't make big refactorings without any new functionality.
- Don't remove functionality unless we discussed that somewhere.
- Don't change whitespaces unnecessarily.
- Don't change line endings (LF/CRLF).
- Don't change formatting (spaces, tabs).
- Don't commit code you don't understand.
- Don't commit code without testing its function (and a bit of debugging).
- Don't put someone else's name in your copyright statement (don't put other people's name in the copyright statement if you add a new class; put your own name).
@@ -1,6 +1,6 @@
# YaCy
[![Build Status](https://travis-ci.org/yacy/yacy_search_server.svg?branch=master)](https://travis-ci.org/yacy/yacy_search_server)

[![Deploy to Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/?repo=https://github.com/yacy/yacy_search_server/tree/master/docker)
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)

## What is this?
@@ -49,23 +49,23 @@ The source code is inside the release package (see /source and /htroot).
## Where is the documentation?

Documentation can be found at:
- (Home Page) http://yacy.net/
- (Home Page) https://yacy.net/
- (German Forum) http://forum.yacy.de/
- (Wiki:de) http://www.yacy-websuche.de/wiki/index.php/De:Start
- (Wiki:en) http://www.yacy-websearch.net/wiki/index.php/En:Start
- (Tutorial Videos) http://yacy.net/en/Tutorials.html and http://yacy.net/de/Lehrfilme.html
- (Tutorial Videos) https://yacy.net/en/Tutorials.html and https://yacy.net/de/Lehrfilme.html

Every of these locations has a (YaCy) search functionality which combines
all these locations into one search result.


## Dependencies? What other software do I need?

You need java 1.7 or later to run YaCy, nothing else.
Please download it from http://www.java.com
You need Java 1.8 or later to run YaCy, nothing else (Java 1.7 can still be used to run the main [1.92/9000 release](https://github.com/yacy/yacy_search_server/releases/tag/Release_1.92) )
Please download it from https://www.java.com

YaCy also runs on IcedTea7.
See http://icedtea.classpath.org
YaCy also runs on Iced Tea 3.
See https://icedtea.classpath.org

NO OTHER SOFTWARE IS REQUIRED!
(you don't need apache, tomcat or mysql or whatever)
@@ -85,7 +85,7 @@ to stop : double-click stopYACY.bat

- on Mac OS X:
please use the Mac Application and start or stop it like any
other Mac Application (doubleclick to start)
other Mac Application (double-click to start)


## How do I use this software, where is the administration interface?
@@ -151,15 +151,15 @@ up to over 1 million web pages then you should start to increase the
memory assignment. Open http://localhost:8090/Performance_p.html
and set a higher/lower memory assignment.
If you have millions of web pages in your search index then you might
habe gigabytes of disk space allocated. You can reduce the disk
have gigabytes of disk space allocated. You can reduce the disk
space i.e. setting the htcache space to a different size; to do that
open http://localhost:8090/ConfigHTCache_p.html and set a new size.


## Join the development!

YaCy was created with the help of many. About 30 programmers have helped,
a list of some of them can be seen here: http://yacy.net/en/Join.html
a list of some of them can be seen here: https://yacy.net/en/Join.html
Please join us!


@@ -176,14 +176,14 @@ Please clone our code and help with development!
The code is licensed under the GPL v2.

Compiling YaCy:
- you need Java 1.7 or later and [Apache Ant](http://ant.apache.org/)
- you need Java 1.8 or later and [Apache Ant](https://ant.apache.org/)
- just compile: "ant clean all" - then you can "./startYACY.sh" or "./startYACY.bat"
- create a release tarball: "ant dist"
- create a Mac OS release: "ant distMacApp" (works only on a Mac)
- create a debian release: "ant deb"
- work with eclipse: within eclipse you also need to start the ant build process
because the servlet pages are not compiled by the eclipse build process
after the dist prodecure, the release can be found in the RELEASE subdirectory
after the dist procedure, the release can be found in the RELEASE subdirectory

Build with Maven:
- for the first time goto subdirectory libbuild (which contains the maven parent pom)
@@ -203,7 +203,7 @@ scripts you can create more shell api access methods yourself easily.

## Contact

Our primary point of contact is the german forum at http://forum.yacy.net
Our primary point of contact is the German forum at http://forum.yacy.net
We encourage you to start a YaCy forum in your own language.

If you have any questions, please do not hesitate to contact the maintainer:
BIN +7.94 KB addon/YaCy256x256.png
Binary file not shown.
@@ -8,9 +8,9 @@
"decentralized",
"java"
],
"website": "http://yacy.net",
"website": "https://yacy.net",
"repository": "https://github.com/yacy/yacy_search_server",
"logo": "http://yacy.net/material/YaCyLogo2011.svg",
"logo": "https://yacy.net/material/YaCyLogo2011.svg",
"env": {
"YACY_INIT_ADMIN_PASSWORD": {
"description": "Administrator initial password : please fill with a Base64 MD5 value",
@@ -2,7 +2,8 @@
; ----------------------------------------
;(C) 2004-2006 by Alexander Schier
;(C) 2008-2010 by David Wieditz
;(C) 2011- by Rene Kluge
;(C) 2011 by Rene Kluge
;(C) 2018 by luccioman; https://github.com/luccioman
/*----------------------------------------
MANUALS
http://nsis.sourceforge.net/Docs/
@@ -63,11 +64,11 @@ SetCompressor /SOLID LZMA
; at least we need Java 8
!define JRE_VERSION8 "1.8"

; download link Oracle Java 8 Update 131
; 32 bit / jre-8u131-windows-i586.exe
!define JRE_32 "http://javadl.sun.com/webapps/download/AutoDL?BundleId=220313_d54c1d3a095b4ff2b6607d096fa80163"
; 64 bit / jre-8u131-windows-x64.exe
!define JRE_64 "http://javadl.sun.com/webapps/download/AutoDL?BundleId=220315_d54c1d3a095b4ff2b6607d096fa80163"
; download links for Oracle Java 8 Update 181 (available at https://java.com/fr/download/manual.jsp)
; 32 bit / jre-8u181-windows-i586.exe
!define JRE_32 "http://javadl.oracle.com/webapps/download/AutoDL?BundleId=234472_96a7b8442fe848ef90c96a2fad6ed6d1"
; 64 bit / jre-8u181-windows-x64.exe
!define JRE_64 "http://javadl.oracle.com/webapps/download/AutoDL?BundleId=234474_96a7b8442fe848ef90c96a2fad6ed6d1"

;!define JRE_32 "http://yacy.berlios.de/download.php?what=jre&version=32&yacyrevnr=@REPL_REVISION_NR@"
;!define JRE_64 "http://yacy.berlios.de/download.php?what=jre&version=64&yacyrevnr=@REPL_REVISION_NR@"

0 comments on commit 3c65a15

Please sign in to comment.
You can’t perform that action at this time.