Commit Graph

229 Commits

Author SHA1 Message Date
Michael Peter Christen
84cf7e8e9f backmigration from solrj 4.6.0 to 4.5.1. This is necessary because
solrj.4.6.0 has a bug which prevents the attachment of a remote solr (as
tested with a SolrCloud). See bug report
https://issues.apache.org/jira/browse/SOLR-5532
This bug shall be fixed in Solr 4.6.1.
Fortunately, solrj-4.5.1 works together with solr-4.6.0 thus the current
index does not need to be changed.
2014-01-15 17:18:32 +01:00
reger
37f2a82a5d making root context (htroot) a WebAppContext
- this allows additional features, like servlet configuration via web.xml and many more things.
- currently the standard servlets are still configured in the code (so the supplied defaults/web.xml is not realy needed, yet),
  but could be expanded
- lookup for web.xml - 1. in /DATA/SETTINGS then in /defaults
2014-01-10 10:42:47 +01:00
reger
1b6d173b14 update to Jetty 8.1.14 2014-01-06 08:48:43 +01:00
reger
7bdc10c1a0 added Windows Service installer
- used Apache procrun as it has a small footprint and comes with a GUI to edit the service settings
  see http://commons.apache.org/proper/commons-daemon/procrun.html

- added the service runner exe file under addon/windowsService
   as is (without renaming the exe files)
- included installYaCyWindowsService.bat and uninstallYaCyWindowsService.bat to main directory
  - which chooses the native exe according to the processor_architecture
2013-12-26 05:07:26 +01:00
reger
2507722fbb updated poi-3.9 / poi-scratchpad-3.9 2013-12-25 22:31:41 +01:00
Michael Peter Christen
68d7ee812e aaaaaaaaaaaaaa 2013-12-23 12:05:44 +01:00
Michael Peter Christen
687f6c6aed remove large memory pages option and added MMapDirectoryFactory for
debian
2013-12-23 11:20:52 +01:00
Michael Peter Christen
122d026910 alphabetic order fix 2013-12-23 10:47:11 +01:00
Michael Peter Christen
7603e879dc Merge branch 'master' into HEAD
Conflicts:
	.classpath
	source/net/yacy/cora/federate/solr/SolrServlet.java
2013-12-20 01:19:06 +01:00
Michael Peter Christen
8b97489ff2 updated guava to 15.0 2013-12-19 22:21:33 +01:00
Michael Peter Christen
34b4eda4a8 upgraded json-simple to 1.1.1 2013-12-19 22:16:01 +01:00
Michael Peter Christen
75ae36da9c upgraded jsch to 0.1.50 2013-12-19 22:13:34 +01:00
Michael Peter Christen
db793a2a5e removed mysql connector which was used only for testing in the past 2013-12-19 22:09:01 +01:00
Michael Peter Christen
7ebc74b76a migrated to pdfbox 1.8.3 2013-12-19 22:06:10 +01:00
Michael Peter Christen
2f16770681 migrated to solr 4.6.0 2013-12-19 21:51:05 +01:00
Michael Peter Christen
b5ce834059 next try to fix m4 2013-12-19 15:35:31 +01:00
Michael Peter Christen
439f8927fc fix for deb m4 2013-12-19 14:40:11 +01:00
Michael Peter Christen
31f4607f2e update to Mac start parameters 2013-12-19 09:42:01 +01:00
Michael Peter Christen
8de3f55a7a removed malicious java start arguments in debian start script which had
been removed from the other start scripts recently. The reason to do so
was a comparisment of a debian-installed YaCy with 20 million document
which crashed after 10 hours with the debian start script, but did not
crash with the startYACY.sh start script. Both scripts now use the same
java start arguments.
Added also the Solr MMapDirectoryFactory switch which was missing so far
in the debian start script.
2013-12-19 09:07:04 +01:00
reger
92d9c56f9f Merge origin/master into jetty 2013-12-05 22:53:29 +01:00
Michael Peter Christen
f722e450b3 changed start parameters which caused deadlocks in mac and windows
versions
2013-12-05 00:55:35 +01:00
reger
1adb4b8741 merge rc1/master 2013-10-16 03:02:21 +02:00
sixcooler
dfb73c9519 bump to httpclient-4.3.1 - a bugfix release 2013-10-14 23:32:24 +02:00
reger
eea504c117 update Info.plist
small DefaultServlet refactoring
2013-10-12 23:01:14 +02:00
reger
a44eede8b8 merge rc1/master 2013-10-11 01:50:25 +02:00
Lotus
202a9fbdad adding synonyms from German OpenThesaurus ready for use in YaCy 2013-10-07 22:02:42 +02:00
Michael Peter Christen
21aa6a0321 migration to Solr 4.5.0 2013-10-07 17:09:40 +02:00
reger
c7c706fd9f merge with rc1/master 2013-09-30 03:46:39 +02:00
sixcooler
15b1bb2513 bump to httpClient-4.3 2013-09-25 14:48:37 +02:00
reger
850609937f update Info.plist for Jetty 9 jars 2013-09-14 20:56:46 +02:00
reger
8e52271491 - delete not needed old jetty jars from libt
- add jetty to Info.plist
2013-09-10 20:55:03 +02:00
Michael Peter Christen
5b7c0d0745 update to pdfbox 1.8.2 2013-07-30 14:14:16 +02:00
Michael Peter Christen
f13df9dbb6 migration to solr 4.4.0 2013-07-30 14:01:16 +02:00
orbiter
f117ea0492 reverted start script options - yacy on windows did not start with the
given values
2013-07-27 15:36:46 +02:00
Roland Haeder
ebbb3bc5c1 Fixed CHMOD on many files + added missing loggers (e.g. jena) and made some noisy loggers quiet 2013-07-13 13:12:36 +02:00
Lotus
338cf0d133 Revert "Revert "Windows installer: update logo""
This reverts commit c66631d407.
2013-07-11 21:48:49 +02:00
Lotus
c66631d407 Revert "Windows installer: update logo"
This reverts commit 41cc9be62b.
2013-07-11 21:48:13 +02:00
Lotus
41cc9be62b Windows installer: update logo 2013-07-11 21:46:46 +02:00
reger
3760e2616b bump up lib/metadata-extractor-2.6.2.jar (used for image parser) with needed code adjustments 2013-06-25 23:24:02 +02:00
Michael Peter Christen
898e14471b changed windows icon again 2013-06-12 00:10:25 +02:00
Michael Peter Christen
a5e328d7c5 new icons 2013-06-11 13:16:46 +02:00
Michael Peter Christen
9bd2aee180 migrated to solr 4.3.0 2013-05-09 02:17:53 +02:00
Michael Peter Christen
ad050ec88d - upgraded httpclient, httpcore and httpmime
- removed httpclient 3.1 which has been used by solrj < 4.x.x and is now
not used any more
- fixed some parts in YaCy which used methods from httpclient 3.1
2013-05-09 00:22:45 +02:00
orbiter
48e9a54e80 updated pdf parser 2013-05-08 15:17:06 +02:00
Michael Peter Christen
27907c9739 added missing library after solr upgrade 2013-04-07 10:36:05 +02:00
Michael Peter Christen
cf0acd2cb4 upgrade to solr 4.2.1 2013-04-06 16:11:24 +02:00
Michael Peter Christen
461d46101d - Removed log4j from libraries. This can be removed because the package
log4j-over-slf4j is there. From slf4j all loggings are routed to the jdk
logger. Now all loggings are consistently done to the jdk logger.
- added some lines to the logging properties to suppress many solr
logging statements. The number of the logging entries had already become
a performance issue, therefore removing these from the log should
increase performance.
2013-02-23 16:45:05 +01:00
orbiter
36f9b0fc16 updated wstx-asl to 3.2.9 2013-02-23 14:33:17 +01:00
Michael Peter Christen
09a2b09c48 guava update 2013-02-04 11:21:05 +01:00
Michael Peter Christen
80fe3d7860 Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
Conflicts:
	source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java
2013-02-04 10:57:54 +01:00
Michael Peter Christen
4323621a76 update to Solr 4.1.0 2013-02-04 10:55:49 +01:00
reger
160ce568b3 move testing SolrServlet.main to test, making include of jetty*.jar in distribution and classpath obsolete
- move jetty*.jar to test library 
- move SolrServlet.main as is to test, add also a junit test simulating main 
  - add build.xml cleanup for EmbeddedSolrConnectorTest created test/DATA
- adjust some test compile errors
2013-02-03 22:32:38 +01:00
sixcooler
f3e705c4fe bump to httpclient / httpcore 4.2.3 (bugfix-release) 2013-01-17 20:10:49 +01:00
Michael Peter Christen
9dfc9c95d8 updated slf4j and log4j 2012-12-27 04:37:21 +01:00
Michael Peter Christen
95712fdc8b update to pdf parser 2012-12-27 04:16:31 +01:00
Michael Peter Christen
e2c4c3c7d3 migration to solr 4.0.0 2012-11-02 12:29:48 +01:00
Michael Peter Christen
69aa39d664 update to libraries required by solr 4.0.0 2012-11-02 10:27:44 +01:00
sixcooler
9d062873d2 bump to httpclient-4.2.2 2012-10-31 19:09:48 +01:00
sixcooler
9aa21506be bump to httpcore-4.2.2 (maintenance release) 2012-10-03 02:15:02 +02:00
Michael Peter Christen
d0015df61c added lucene memory library which is now necessary as solr has to
process more complex queries
2012-09-28 13:48:51 +02:00
Michael Peter Christen
80edd8ecd7 some more after-refactoring fixes 2012-09-28 10:24:57 +02:00
Michael Peter Christen
e65cecc419 - updated lucene libraries to 3.6.1
- added lucene-grouping which enables faceted search; try this:
http://localhost:8090/solr/select?q=*:*&start=0&rows=3&facet=true&facet.field=host_s
2012-09-10 10:12:38 +02:00
Michael Peter Christen
2ccf1dba71 upgrade to solr 3.6.1 2012-08-17 15:11:21 +02:00
orbiter
da93addec3 addon to e74d66e28c
(removed htmlparser.jar): for Mac App
2012-08-16 07:28:38 +02:00
sixcooler
a99ef68422 bump to httpclient-4.2.1 2012-07-09 18:58:33 +02:00
Michael Peter Christen
7b53be141f upgraded to pdfbox 1.7.0
changes in http://www.apache.org/dist/pdfbox/1.7.0/RELEASE-NOTES.txt
with many bugfixes, including performance related
2012-06-22 16:49:58 +02:00
Michael Peter Christen
fad3b14813 added jetty libraries, needed for future use as web server and as
application server for the solr search interface
2012-06-22 15:31:17 +02:00
Michael Peter Christen
1be0025a9c - added test for EmbeddedSolrConnector
- added needed libraries for this test
this includes most (all) files needed for an embedded solr
2012-06-22 00:36:49 +02:00
Michael Peter Christen
f094936b89 added new class libraries to mac app 2012-06-21 14:59:55 +02:00
cominch
5d20cd324a Add Triplestore and RDF query interface
Conflicts:
	build.xml
	defaults/yacy.init
	source/net/yacy/interaction/AugmentHtmlStream.java
2012-06-10 10:35:59 +02:00
cominch
b21048892b augmentedParser add features and integrate external html parser to
modify existing web pages

Conflicts:
	addon/YaCy.app/Contents/Info.plist
	build.xml
2012-06-10 10:23:35 +02:00
sixcooler
56087c1f23 bump to httpclient- httpcore-, httpmime- 4.2 2012-05-30 14:46:21 +02:00
Michael Peter Christen
4d3cc02168 replaced old bzip2 library against better documented commons-compress
package from http://commons.apache.org/compress/
2012-05-28 23:53:48 +02:00
Michael Peter Christen
6c4f8fdc44 removed superfluous files 2012-04-30 11:09:54 +02:00
Michael Peter Christen
62f2554a01 - fixed build problems (deprecated methods using httpclient 3.1)
- removed httpclient 3.1 lib which was used by solrj (solrj now uses
httpclient 4)
2012-04-27 17:46:08 +02:00
Michael Peter Christen
f838997126 updated commons io from 2.0.1 to 2.1 2012-02-24 01:35:01 +01:00
Michael Peter Christen
eeb57ae824 updated http client libraries 2012-02-24 01:06:30 +01:00
Michael Peter Christen
a30b028cc0 updated libraries 2012-01-18 01:21:41 +01:00
lotus
e09e27b1ac Win installer:
remove Berlios redirect to updated JRE, link is now hardcoded again,
JRE update

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@8003 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-10-23 19:53:51 +00:00
orbiter
65ab067491 migration to solrj 3.4.0
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7952 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-09-14 20:08:59 +00:00
orbiter
dc25c48fc9 added more libraries that are needed by solrj
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7922 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-09-02 23:43:04 +00:00
sixcooler
52b477cf6f bump to httpclient-4.1.2, httpcore-4.1.3 - bugfixrelease
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7876 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-08-12 17:42:32 +00:00
sixcooler
48560a44a9 bump to httpcore-4.1.2: a bugfixrelease
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7853 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-07-25 00:48:29 +00:00
orbiter
d3c89b90ce temporary adding the old httpclient-3.1 again because the solrj classes need them. should be removed as soon solrj supports httpclient-4
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7831 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-07-04 17:04:49 +00:00
orbiter
768c59740c - replaced solrj 3.1 with solrj 3.3
- updated also slf4j
- added authentication for solrj


git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7829 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-07-04 16:35:30 +00:00
orbiter
4f730a711b same for debian as for latest commit
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7824 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-07-03 21:40:12 +00:00
orbiter
60ee245486 setting startup options:
-Xss256k
and
-XX:ReservedCodeCacheSize=1024m 
after appearance of a malloc error together with a crash of the jvm which stated at the end of the log:

# There is insufficient memory for the Java Runtime Environment to continue.
# Native memory allocation (malloc) failed to allocate 32756 bytes for ChunkPool::allocate
# Possible reasons:
#   The system is out of physical RAM or swap space
#   In 32 bit mode, the process size limit was hit
# Possible solutions:
#   Reduce memory load on the system
#   Increase physical memory or swap space
#   Check if swap backing store is full
#   Use 64 bit Java on a 64 bit OS
#   Decrease Java heap size (-Xmx/-Xms)
#   Decrease number of Java threads
#   Decrease Java thread stack sizes (-Xss)
#   Set larger code cache with -XX:ReservedCodeCacheSize=

this follows the last two points in the list of recommendations. To set appropriate values the default values from
http://www.oracle.com/technetwork/java/hotspotfaq-138619.html
and 
http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
had been considered

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7823 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-07-03 21:33:24 +00:00
orbiter
528b59e078 replaced xerces.jar library that was originally added 2005 with SVN 126 to the libx directory and that was moved to lib in SVN 5781
the new replacement is taken from http://xerces.apache.org and has the version 2.11.0 and was inside the file Xerces-J-bin.2.11.0.tar.gz
and consists of two files named xercesImpl.jar and xml-apis.jar
The original purpose of that library was to support:
- content parsers
- optional seed uploader
- SOAP API (which will be committed later)
Since the SOAP API does not exist any more the purpose is to support content parser and an optional seed uploader

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7819 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-07-02 22:33:35 +00:00
orbiter
e7e1a0f328 replaced commons-io v1.4 with v2.0.1
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7818 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-07-02 21:10:13 +00:00
orbiter
5092a14bcb replaced fontbox, jempbox, pdfbox v 1.5 with v1.6
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7817 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-07-02 20:52:33 +00:00
orbiter
7bf39c8bcf added XX:MaxPermSize to debian and mac start scripts
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7813 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-07-01 22:50:46 +00:00
orbiter
77fe69395d added jempbox-1.5.0.jar which is required by pdfbox-1.5 as stated in http://pdfbox.apache.org/dependencies.html
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7774 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-06-05 20:04:41 +00:00
sixcooler
efcd21e0ed new httpclient, httcore (bugfixrelease)
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7769 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-06-02 21:34:50 +00:00
orbiter
761b1c71dc added latest pdfbox
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7761 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-05-30 14:56:36 +00:00
lotus
8fd4e8ea98 proper jre version (without -s in filename)
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7699 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-05-05 20:03:27 +00:00
pca
5e2d38ef19 Windows Installer:
- fix for firewall Vista/Win7
- update to JRE 1.6 u25
- TODO: fix for firewall WinXP and setting for uPnP (Port 1900)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7689 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-04-30 19:32:07 +00:00
sixcooler
0abd99621c correct slip of click in classpath from last commit - I wonder there are 7658'is around
apflemaenchen, please don't take this amiss

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7659 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-04-16 03:08:25 +00:00
orbiter
19fd13d3bc Added federated index storage to solr.
YaCy supports now the storage to remote solr indexes.
More federated storage (and search) methods may follow.

The remote index scheme is the same as produced by the SolrCell; see
http://wiki.apache.org/solr/ExtractingRequestHandler
Because this default scheme is used, the default example scheme can be used as solr configuration
This is also the same scheme that solr uses if documents are imported with apache tika.

federated solr storage is switched off by default.

To use this, do the following:
- set federated.service.solr.indexing.enabled = true
- download solr from http://www.apache.org/dyn/closer.cgi/lucene/solr/
- extract the solr (3.1) package, 'cd example' and start solr with 'java -jar start.jar'
- start yacy and then start a crawler. The crawler will fill both, YaCy and solr indexes.
- to check whats in solr after indexing, open http://localhost:8983/solr/admin/

Until now it is not possible to use the solr index to search with YaCy in that solr index.
This functionality is now available for two reasons:
1) to compare the functionality of Solr and YaCy and to compare the search speed
2) to use YaCy as a search appliance for people who need a crawler or other source harvesting methods
   that YaCy provides (like dublin core reading, wikimedia dump reading, rss feed reader etc) if people still
   want to use solr instead of YaCy.

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7654 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-04-14 20:05:04 +00:00
f1ori
399d7d6878 * fix permissions of bin/-folder in debian package
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7647 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-04-07 07:31:17 +00:00
f1ori
df71776929 * fix bug #7
* log requires poison to finish, so Base64Order main-function doesn't finish, when called from debian configure script


git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7616 6c8d7289-2bf4-0310-a012-ef5d649a1542
2011-03-21 19:42:22 +00:00