Commit Graph

333 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
e03c9306e8 include install/uninstallYaCyWindowsService.bat
as wrappers to copy
2013-12-29 23:16:20 +01:00
reger
2507722fbb updated poi-3.9 / poi-scratchpad-3.9 2013-12-25 22:31:41 +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
reger
06da6f517c add YaCyProxyServlet to handle /proxy.html?url=proxyurl
- based on Jetty ProxyServlet
- at this time use existing HTTPD ProxyHandler  for url rewrite
- add jetty-client jar (dependency in Jetty ProxyServlet)

reuse ProxyHandler.convertHeaderFromJetty in YaCyDefaultServlet
2013-10-27 05:04:24 +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
cf32a92629 - add size check to multipart form data handling of YaCyDefaultServlet (same as in HTTPDemon.parseMultipart)
- reduce Jetty logging 
- give build.run a bit more memory (set to YaCy.default 600m from 512m)
2013-10-13 20:56:03 +02:00
reger
a44eede8b8 merge rc1/master 2013-10-11 01:50:25 +02:00
reger
71d2655c02 downgrade to Jetty 8 to assure support of JRE 1.6
- introduce a YaCyHttp interface to modulize/separate http server
- adjust the Jetty version specific implementation part (in package net.yacy.http)
     - putting the version specific code in classes starting with Jetty8xxxx
     - moved existing Jetty9xxx implementation into a test class (to keep the code)
- adjust build to the changed jars
- make use of the introduced YaCyHttpServer interface in related htroot servlets

- adjust other test cases/classes
2013-10-09 00:40:48 +02:00
Michael Peter Christen
21aa6a0321 migration to Solr 4.5.0 2013-10-07 17:09:40 +02:00
reger
f46771bdf5 upd build script from rc1/master 2013-09-30 03:47:55 +02:00
sixcooler
15b1bb2513 bump to httpClient-4.3 2013-09-25 14:48:37 +02:00
reger
f7f86d8a5d update to Jetty 9 jars
- include javax.servlet 3.0
2013-09-14 20:49:05 +02:00
reger
aafef72a8a merged current rc1/master into jetty branch to allow further development with latest version
ServerSideIncludes and servlet return values need further work (for working jetty integration)
- TODO: added nasty quickfix to allow SSI -  needs further work
- TODO: YaCy servlet return values/parameters are not handled
2013-09-09 02:36:06 +02:00
sixcooler
5189620026 add branch to packet-name if not build from master 2013-08-06 03:48:29 +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
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
5f92c68f1f removed block rank ranking and all YBR files in /ranking 2013-05-30 13:01:22 +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
reger
1951ba61ae remove CPGEN from Windows batch files
(classpath for all needed libraries is defined in manifest  of yacycore.jar)
2013-02-17 03:26:46 +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
reger
be5d3a1066 adding classpath to Manfiest of yacycore.jar
- this allows to start w/o giving explicite java -cp (just java -jar lib/yacycore.jar works)
- especially helpful while running YaCy as Win service, 
  making it obsolete to adjust classpath cfg of the service wrapper on upgrades of lib/*.jar's
2013-01-29 03:01:57 +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
sof
5cb244b79b Merge remote branch 'origin/master' 2012-10-05 18:54:39 +02:00
apfelmaennchen
88b062210c Added a parser for audio file tags (e.g. ID3 tags for MP3 files) based
on the jaudiotagger library. The parser is disabled by default as it
needs to store temporary files for non file:// protocols, which might be
disliked. For your local MP3-collection it loads nicely Artist,
Title, Album etc. from the audio files meta data.
2012-10-05 18:54:26 +02:00