Commit Graph

34 Commits

Author SHA1 Message Date
Alan Woodward 3fb008e7f0 SOLR-6170: Merge CoreContainer preRegisterInZk and register methods into create method
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1606891 13f79535-47bb-0310-9956-ffa450edef68
2014-06-30 19:41:07 +00:00
Dawid Weiss cf5a0caeb6 LUCENE-5650: Enforce read-only access to any path outside the temporary folder via security manager
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1596767 13f79535-47bb-0310-9956-ffa450edef68
2014-05-22 06:15:26 +00:00
Steven Rowe 033f80fd7a SOLR-6006: fix Solr contrib test dependencies by adding jcl-over-slf4j and retrieving it into each contrib's test-lib/ directory
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1589953 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 08:55:05 +00:00
Michael McCandless 8559eafd99 LUCENE-4246: fix IW.close to just close, even on exception
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1585759 13f79535-47bb-0310-9956-ffa450edef68
2014-04-08 15:34:50 +00:00
Dawid Weiss bc43bebedf Merging with trunk.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr5914@1584603 13f79535-47bb-0310-9956-ffa450edef68
2014-04-04 10:27:05 +00:00
Uwe Schindler f682af8641 LUCENE-5560: Replace com.google.common.base.Charsets by Java7 StandardCharsets
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1583476 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 22:16:44 +00:00
Uwe Schindler 6750845f9b LUCENE-5560: Followup: Cleanup charset handling for Java 7
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1583449 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 20:35:16 +00:00
Mark Robert Miller 30711a3c34 SOLR-5914: Fix map-reduce contrib tests use of solrhome.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr5914@1582575 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 01:20:31 +00:00
Mark Robert Miller 48c5ea550f SOLR-5914: Merge branch up to trunk, make all tests pass, make some other improvements and small changes.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr5914@1582571 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 00:55:45 +00:00
Mark Robert Miller 6afdd45556 SOLR-5914: Solr tests should use dataDir for tmp files.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1582413 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 17:23:40 +00:00
Dawid Weiss 688addbd50 Branch for solr5914
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr5914@1582248 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 10:45:40 +00:00
Uwe Schindler b569844e04 LUCENE-5540: Update forbidden-apis, pegdown, groovy
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1579399 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 21:08:42 +00:00
Mark Robert Miller 1109c1275b SOLR-5883: Many tests do not shutdown SolrServer.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1579336 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 18:25:00 +00:00
Mark Robert Miller 84e2979d81 SOLR-5824: Merge up Solr MapReduce contrib code to latest external changes. Includes a few minor bug fixes.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1579318 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 17:52:10 +00:00
Robert Muir 3b67b17493 LUCENE-5512: remove redundant typing (diamond operator) in trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1576755 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 14:39:17 +00:00
Mark Robert Miller 9441f0d4ce SOLR-5734: We should use System.nanoTime rather than System.currentTimeMillis when calculating elapsed time.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1573425 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 02:08:45 +00:00
Mark Robert Miller 8830ab2dc5 SOLR-5782: The full MapReduceIndexer help text does not display when using --help. Also remove reference to Find tool - we don't have access to it yet.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1572778 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 23:15:05 +00:00
Mark Robert Miller d98ee29e8e SOLR-5776: Suppress SSL
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1572408 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 02:23:20 +00:00
Mark Robert Miller 4d975ea3a9 tests: some doc improvements around SuppressSSL
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1572385 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 01:34:41 +00:00
Robert Muir 9c450302e5 SOLR-5771: Add SuppressSSL instead of static boolean in SolrTestCaseJ4
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1571691 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 13:50:03 +00:00
Uwe Schindler efbd2b9d82 Disable 2 tests not working on windows (they are not run from ANT because of another assume, but eclipse tries to run them - no security manager).
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1571111 13f79535-47bb-0310-9956-ffa450edef68
2014-02-23 22:50:44 +00:00
Uwe Schindler 955282775c SOLR-5764: Fix recently added tests to not use absolute paths to load test-files, use SolrTestCaseJ4.getFile() and getResource() instead; fix morphlines/map-reduce to not duplicate test resources and fix dependencies among them.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1570898 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 20:02:13 +00:00
Steven Rowe 114ce52b03 LUCENE-5465: Solr Contrib map-reduce breaks Manifest of all other JAR files by adding a broken Main-Class attribute
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1570738 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 22:47:52 +00:00
Mark Robert Miller a127d61d70 SOLR-1301: Add some readme files.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1568317 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 14:39:00 +00:00
Mark Robert Miller 20f7720a30 SOLR-3854: Update MorphlineGoLiveMiniMRTest for SSL. Disable SSL for now .
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1567700 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 17:43:10 +00:00
Mark Robert Miller de6514e214 SOLR-3854: SSL support for SolrCloud
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1566456 13f79535-47bb-0310-9956-ffa450edef68
2014-02-09 22:39:48 +00:00
Mark Robert Miller 330880c57e SOLR-1301: Throw an error if HdfsDirectoryFactory is not configured for now.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1558670 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 01:59:01 +00:00
Mark Robert Miller 50e277c1ef SOLR-1301: make debugging these tests a whole lot easier by sending map reduce job logging to std out
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1555647 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 02:03:00 +00:00
Mark Robert Miller 0a6017d7da SOLR-1301: Merge Morphlines modules up to Kite 0.10 and CDK 0.9
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1552398 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 19:13:47 +00:00
Mark Robert Miller e7d605a2d5 SOLR-1301: Update to Kite 0.10 from CDK 0.9
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1552381 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 17:51:39 +00:00
Mark Robert Miller 00b0209844 SOLR-1301: Fix a couple of bugs around setting up the embedded Solr instance.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1548600 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 17:04:47 +00:00
Mark Robert Miller 6350b2d709 SOLR-1301: Clean up.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1547962 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 23:28:50 +00:00
Mark Robert Miller b2a253a930 SOLR-1301: Merge in latest solr-map-reduce updates.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1547871 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 18:28:45 +00:00
Mark Robert Miller bca33f30d2 SOLR-1301: Straighten out module names so that they match current convention
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1547819 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 15:15:24 +00:00