Commit Graph

381 Commits

Author SHA1 Message Date
Mark Robert Miller 34417d7bf1 SOLR-4737: Update Guava to 14.01
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1469663 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 02:06:36 +00:00
Steven Rowe 7bc4cd24a4 SOLR-3706: Maven configuration: sync with Ant build
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1461830 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 20:01:17 +00:00
Steven Rowe 396300149d LUCENE-4879: Add randomizedtesting-runner 2.0.9 SHA1 to solr/licenses/; Maven configuration: upgrade randomizedtesting-runner from 2.0.8 to 2.0.9.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1461161 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 14:59:37 +00:00
Robert Muir edc777e22e SOLR-4607: use noggit 0.5 release jar
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1457811 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 15:28:35 +00:00
Uwe Schindler 6231597974 LUCENE-4747: Move to Java 7 in trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1457734 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 12:28:52 +00:00
Steven Rowe 4618a5a0fe SOLR-4503: Add REST API methods to get schema information: fields, dynamicFields, fieldTypes, and copyFields. Restlet 2.1.1 is integrated and is used to service these requests.
Also fixes bugs in dynamic copyField logic described in SOLR-3798.
Also fixes a bug with proxied SolrCloud requests (SOLR-4210) when using the GET method.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1453161 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 04:50:33 +00:00
Steven Rowe 4cd9dbd6aa SOLR-4416: Maven configuration: upgrade Tika dependency to 1.3, and add new excluded transitive dependency: com.adobe.xmp:xmpcore
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1452919 13f79535-47bb-0310-9956-ffa450edef68
2013-03-05 17:56:58 +00:00
Dawid Weiss 2080245c8d SOLR-4259: Carrot2 dependency should be declared on the mini version, not the core.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1452220 13f79535-47bb-0310-9956-ffa450edef68
2013-03-04 09:30:00 +00:00
Robert Muir abd85ff5a0 SOLR-3843: add lucene-codecs.jar
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1451542 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 09:41:03 +00:00
Steven Rowe 29bc4ed434 Upgrade to latest Apache parent POM
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1451030 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 23:26:08 +00:00
Steven Rowe 654dd7eef2 Upgraded maven plugins to the most recent versions
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1450066 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 08:27:31 +00:00
Steven Rowe 6449c08e37 LUCENE-4570: Maven ForbiddenAPIs configuration cleanups:
- Clean up overly long execution IDs
- Make at least one test-check execution per module include internalRuntimeForbidden=true
- Make at least one test-check execution per module include signatureFile executors.txt
- Include bundledSignature commons-io-unsafe in solr test-framework forbiddenapis check
- Note in the Solr shared test-check configuration to include bundledSignature commons-io-unsafe only in modules with commons-io on their classpath

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1447138 13f79535-47bb-0310-9956-ffa450edef68
2013-02-18 07:20:23 +00:00
Steven Rowe 2c95e26af2 LUCENE-4570: Added ForbiddenAPI checks to the Maven build using the ForbiddenAPI Mojo; also removed redundant maven-surefire-plugin configurations in Solr modules' POMs after putting a shared configuration in the Solr parent POM.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1446991 13f79535-47bb-0310-9956-ffa450edef68
2013-02-17 02:18:56 +00:00
Chris M. Hostetter f16037ec2d SOLR-4451: SolrJ, and SolrCloud internals, now use SystemDefaultHttpClient under the covers -- allowing many HTTP connection related properties to be controlled via 'standard' java system properties. (hossman)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1445945 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 21:45:57 +00:00
Steven Rowe e8cde1beb5 Add missing /project/build/resources/resource/ elements for src/resources/ in the facet and demo modules
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1445380 13f79535-47bb-0310-9956-ffa450edef68
2013-02-12 21:16:26 +00:00
Steven Rowe 99d5012dd8 LUCENE-3998: Maven configuration: no longer any need to add src/examples/ as a source path
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1445002 13f79535-47bb-0310-9956-ffa450edef68
2013-02-12 00:25:05 +00:00
Simon Willnauer 81c7ba4601 LUCENE-4728: Unknown and not explicitly mapped queries are now rewritten against the highlighting IndexReader to obtain primitive queries before discarding the query entirely.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1442590 13f79535-47bb-0310-9956-ffa450edef68
2013-02-05 13:59:26 +00:00
Steven Rowe 4bd78bb389 LUCENE-3998: Maven and IntelliJ configurations: add facet module dependency to the demo module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440681 13f79535-47bb-0310-9956-ffa450edef68
2013-01-30 21:32:28 +00:00
Mark Robert Miller 8a23ab7cfd SOLR-4308: Remove license files and maven references
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1434022 13f79535-47bb-0310-9956-ffa450edef68
2013-01-16 16:29:46 +00:00
Dawid Weiss 0d05a14bd6 SOLR-4106: Javac/ ivy path warnings with morfologik fixed by updating to Morfologik 1.5.5 (no functional changes).
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1428823 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 12:42:00 +00:00
Steven Rowe 6c4baf2bf4 SOLR-3279: Maven configuration: exclude unused carrot2-core transitive dependencies: jfree:jcommon; org.apache.commons:commons-math; org.uncommons.maths:uncommons-maths; and xpp3:xpp3.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1427841 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 16:14:47 +00:00
Stanisław Osiński bf412aa62c SOLR-3279: upgrade Carrot2 to version 3.6.2
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1427747 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 11:41:19 +00:00
Dawid Weiss a25096e273 LUCENE-4650: Upgrade randomized testing to version 2.0.8: make the test framework more robust under low memory conditions.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1427696 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 08:16:22 +00:00
Uwe Schindler dbd1d94004 SOLR-3735: Update velocity also in Maven
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1426839 13f79535-47bb-0310-9956-ffa450edef68
2012-12-29 21:29:05 +00:00
Uwe Schindler ba52cd4e03 Revert SOLR-1972
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1426230 13f79535-47bb-0310-9956-ffa450edef68
2012-12-27 15:48:37 +00:00
Steven Rowe cb6d05f463 SOLR-4205: Maven configuration: upgrade randomizedtesting-runner to v2.0.7
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1423252 13f79535-47bb-0310-9956-ffa450edef68
2012-12-18 02:23:45 +00:00
Uwe Schindler 497342bd6b LUCENE-4632: Restrict test-framework's write permissions more: Only allow write to per-JVM CWD and the clover.db.dir; update randomizedtesting to 2.0.6
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1422437 13f79535-47bb-0310-9956-ffa450edef68
2012-12-16 00:50:32 +00:00
Uwe Schindler 6af24c8866 SOLR-4189: Fix hanging threads on FreeBSD in JettySolrRunner by making connector configureable through sysprop, listen only on 127.0.0.1 in tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1422127 13f79535-47bb-0310-9956-ffa450edef68
2012-12-14 22:19:58 +00:00
Steven Rowe acbe23061b Maven configuration: divert test console output to log files; increase max perm gen to avoid OOMs this will otherwise cause in Maven
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1421332 13f79535-47bb-0310-9956-ffa450edef68
2012-12-13 15:13:43 +00:00
Steven Rowe b835a4a426 Maven configuration: Solrj: exclude unused netty dependency from zookeeper dependency
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1420786 13f79535-47bb-0310-9956-ffa450edef68
2012-12-12 15:49:43 +00:00
Mark Robert Miller 52536c12a2 SOLR-4114: add back commented out test with 10 second wait, add Per's new test, add test to ensure no two cores use the same index directory
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1420327 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 18:32:37 +00:00
Robert Muir 56df745988 SOLR-4155: upgrade jetty to 8.1.8
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1419466 13f79535-47bb-0310-9956-ffa450edef68
2012-12-10 14:02:32 +00:00
Dawid Weiss f26a84adca LUCENE-4603: Upgrade randomized testing to version 2.0.5: print forked JVM PIDs on heartbeat from hung tests (Dawid Weiss)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1419261 13f79535-47bb-0310-9956-ffa450edef68
2012-12-10 08:41:16 +00:00
Uwe Schindler 5292ac4b5e LUCENE-4589: Fix maven pom
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1417901 13f79535-47bb-0310-9956-ffa450edef68
2012-12-06 14:24:37 +00:00
Steven Rowe 9cd426aa0c SOLR-3602: Maven configuration: Exclude new zookeeper 3.4.5 transitive dependency org.slf4j:slf4j-log4j12
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1415408 13f79535-47bb-0310-9956-ffa450edef68
2012-11-29 22:09:16 +00:00
Steven Rowe fd84d881ff SOLR-3849: Maven configuration += -Djava.awt.headless=true; also, upgrade maven-surefire-plugin to 2.12.4
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1415402 13f79535-47bb-0310-9956-ffa450edef68
2012-11-29 22:03:10 +00:00
Mark Robert Miller ad138e5219 SOLR-4119: Update Guava to 13.0.1
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1414853 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 18:31:13 +00:00
Steven Rowe b67c9e54ea SOLR-3602: Maven configuration: Update ZooKeeper to 3.4.5
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1411724 13f79535-47bb-0310-9956-ffa450edef68
2012-11-20 16:19:20 +00:00
Steven Rowe 211a24c489 SOLR-2045: Maven configuration: add derby test dependency to DIH
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1408685 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 11:54:24 +00:00
Steven Rowe 5ba17cf480 SOLR-4031: Eclipse and Maven configurations: Upgrade to Jetty 8.1.7
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1407120 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 15:18:10 +00:00
Steven Rowe 4156f1daa2 SOLR-1972: Maven configuration: add metrics-core dependency to solr-core POM
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1403610 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 03:45:02 +00:00
Dawid Weiss e0e91d252f Upgrade randomized testing to version 2.0.4: avoid hangs on shutdown
hooks hanging forever by calling Runtime.halt() in addition to 
Runtime.exit() after a short delay to allow graceful shutdown (Dawid Weiss)



git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1402952 13f79535-47bb-0310-9956-ffa450edef68
2012-10-28 08:34:26 +00:00
Steven Rowe ec9a50132a LUCENE-4345: Maven and IntelliJ configuration: add new lucene/queries compile dependency, and new lucene/analysis/common test dependency. Make ClassificationTestBase abstract, so that the IntelliJ runner doesn't "fail to start" it.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1401498 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:56:51 +00:00
Steven Rowe bacc9ff49f Fix parent pom relative path
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1401488 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:18:02 +00:00
Dawid Weiss 8fd5dd6bdd Updating rr to 2.0.3
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1395778 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 21:05:46 +00:00
Michael McCandless 59a63c2f32 LUCENE-4451: upgrade to randomizedtesting-2.0.2.jar to reduce RAM overhead for tracking new threads
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1392541 13f79535-47bb-0310-9956-ffa450edef68
2012-10-01 19:29:53 +00:00
Dawid Weiss 5efe1b60ba LUCENE-4406, LUCENE-4407: Upgrade to randomizedtesting 2.0.1.
Workaround for broken test output XMLs due to non-XML text unicode
chars in strings. Added printing of failed tests at the end of a
test run (Dawid Weiss)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1387577 13f79535-47bb-0310-9956-ffa450edef68
2012-09-19 13:19:12 +00:00
Robert Muir 310eb39792 LUCENE-3720: fix BeiderMorseFilter OOM issues
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1386662 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 15:32:46 +00:00
Steven Rowe 7a51f2aefe set svn:eol-style=native
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1384484 13f79535-47bb-0310-9956-ffa450edef68
2012-09-13 19:31:50 +00:00
Steven Rowe d6570e8a41 LUCENE-4345: Maven configuration for new classification module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1384470 13f79535-47bb-0310-9956-ffa450edef68
2012-09-13 18:57:35 +00:00
Steven Rowe 214cacd544 LUCENE-4365: remove unnecessary randomized-runner dependency from the lucene-core-tests module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1382143 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 20:01:06 +00:00
Steven Rowe d996a35681 LUCENE-4365: Upgrade maven-install-plugin to just-released v2.4, to enable skipping installation of artifacts from modules solr-core-tests and solr-solrj-tests.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1382023 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 13:40:48 +00:00
Robert Muir f7e7097edd eol-style=native
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1381812 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 00:10:20 +00:00
Steven Rowe d3383239f8 LUCENE-4365: split maven modules into main/test sub-modules for the four modules with cyclic dependencies on the Lucene or Solr test-framework modules: lucene-core, lucene-codecs, solr-core, and solr-solrj
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1381779 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 22:17:03 +00:00
David Wayne Smiley 1db287ce64 LUCENE-4351 update to Spatial4j 0.3. Lucene spatial distances are now all degrees based (0-180). Also, improved TestRecursivePrefixTreeStrategy.geohashRecursiveRandom() to use circle index clusters.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1381230 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 15:37:11 +00:00
Dawid Weiss b3c300709c LUCENE-4360: Support running the same test suite multiple times in parallel.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1381123 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 10:05:44 +00:00
Adrien Grand 257db54ab0 LUCENE-4340: move non-default codec, postings format and terms dictionary implementations to lucene/codecs.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1381071 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 08:44:11 +00:00
Steven Rowe 21a9087986 LUCENE-4358: Maven configuration: revert removal of Apache snapshot repo declaration in the grandparent POM, and add a clause to disable snapshots.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1380993 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 05:09:26 +00:00
Robert Muir 6bfbc40a35 LUCENE-4354: fix maven dependencies to be consistent with binary package (selckin's patch)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1380899 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 21:35:34 +00:00
Steven Rowe 4cec18130d LUCENE-4358: Remove Apache snapshot repo from the grandparent POM
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1380725 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 16:12:43 +00:00
Robert Muir 7801531900 LUCENE-4356: settle on one version of commons-compress
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1380683 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 15:39:55 +00:00
Steven Rowe 09c824ce4c Maven configuration: solr-core test resources are no longer needed by contribs
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1379989 13f79535-47bb-0310-9956-ffa450edef68
2012-09-02 14:51:14 +00:00
Steven Rowe 4db5c1f5bb SOLR-3780: Maven build: Make solrj tests run separately from solr-core.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1379820 13f79535-47bb-0310-9956-ffa450edef68
2012-09-01 18:08:17 +00:00
Robert Muir 84fb1d09d0 LUCENE-4334: remove unnecessary ant-junit dependency
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1378090 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 11:50:28 +00:00
Steven Rowe 24b60f3a45 SOLR-3707: Maven configuration: Tika version: 1.1->1.2
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1374764 13f79535-47bb-0310-9956-ffa450edef68
2012-08-19 15:07:06 +00:00
Steven Rowe 4f57dc4145 maven build: reduce solr test logging output, to allow Jenkins mailer to succeed
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1372190 13f79535-47bb-0310-9956-ffa450edef68
2012-08-12 19:58:13 +00:00
Steven Rowe 48e9e9f361 fix clustering and DIH problems with conflicting servlet-api dependencies by making scope be provided in solr's test-framework POM
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1372145 13f79535-47bb-0310-9956-ffa450edef68
2012-08-12 16:29:30 +00:00
Dawid Weiss cebfa0b9b9 LUCENE-3985: Upgrade to randomizedtesting 2.0.0. Added support for thread leak detection. Added support for suite timeouts. (Dawid Weiss)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1372068 13f79535-47bb-0310-9956-ffa450edef68
2012-08-12 11:23:11 +00:00
Steven Rowe e0dbd4c4f6 Add new test-framework dependencies introduced by Mark Miller's r1370864 commit: javax.servlet:servlet-api; org.eclipse.jetty:jetty-servlet; and org.eclipse.jetty:jetty-util (jetty-util was previously runtime scope, but is now compile scope)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1370944 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 20:21:41 +00:00
Steven Rowe bc7578d8b6 LUCENE-4296: Update/clean up Maven POMs and documentation
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1370513 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 20:47:05 +00:00
Steven Rowe 15ab29fc95 LUCENE-2510: Add resources directories, containing META-INF/services/o.a.l.analysis.util.*Factory, to POMs for analysis modules that previously didn't have them, so that these files will make it into the Maven-produced jars
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1369961 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 20:05:36 +00:00
Mark Robert Miller 45030e76eb SOLR-3639: Update ZooKeeper to 3.3.6
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1369025 13f79535-47bb-0310-9956-ffa450edef68
2012-08-03 15:22:17 +00:00
Steven Rowe 5abc76ea42 LUCENE-3747: Support Unicode 6.1.0.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1365971 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 12:56:35 +00:00
Mark Robert Miller 24dae70408 SOLR-3639: Update ZooKeeper to 3.3.5 for a variety of bug fixes.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1363024 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 17:26:47 +00:00
Steven Rowe 27b51cb0e4 LUCENE-4220: Maven configuration: add nekohtml dependency
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1362236 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 20:19:39 +00:00
Mark Robert Miller 46021d4575 SOLR-3460: Add cloud-scripts directory and a zkcli.sh|bat tool for easy scripting and interaction with ZooKeeper.
SOLR-3609: Change Solr's expanded webapp directory to be at a consistent path called solr-webapp rather than a temporary directory.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1360416 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 21:45:43 +00:00
Dawid Weiss b57a83e50a LUCENE-4094: Support overriding file.encoding on forked test JVMs
(force via -Drandomized.file.encoding=XXX). (Dawid Weiss)

LUCENE-4189: Test output should include timestamps (start/end for each
test/ suite). Added -Dtests.timestamps=[off by default]. (Dawid Weiss)

LUCENE-4110: Report long periods of forked jvm inactivity (hung tests/ suites).
Added -Dtests.heartbeat=[seconds] with the default of 60 seconds.
(Dawid Weiss)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1357543 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 10:40:01 +00:00
Dawid Weiss 8127865e2d LUCENE-4138: Update morfologik (polish stemming) to release 1.5.3. Changed the way morphosyntactic tags are exposed (a list of tags for a single lemma instead of a compound tag).
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1354840 13f79535-47bb-0310-9956-ffa450edef68
2012-06-28 07:35:36 +00:00
Dawid Weiss 36563ae507 LUCENE-4112: upgrade ant dependency to 1.8.2.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1346369 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 12:26:01 +00:00
Steven Rowe 8359af4d65 Added note about non-official versions triggering test method failure.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1344336 13f79535-47bb-0310-9956-ffa450edef68
2012-05-30 16:22:31 +00:00
Steven Rowe a0e590a119 fix typo
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1344314 13f79535-47bb-0310-9956-ffa450edef68
2012-05-30 15:53:04 +00:00
Steven Rowe 5a8c52dbc1 4.0 -> 5.0
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1344281 13f79535-47bb-0310-9956-ffa450edef68
2012-05-30 14:45:44 +00:00
Robert Muir f5223505b0 4.0 -> 5.0
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1343848 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 17:01:58 +00:00
Dawid Weiss 4652d65f0b LUCENE-4047: Cleanup of LuceneTestCase: moved blocks of initialization/ cleanup code into JUnit instance and class rules.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1338826 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 18:47:45 +00:00
Steven Rowe b8dcc88af6 Maven configuration: Upgrade randomizedtesting-runner dependency from v1.3 to v1.4
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1336356 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 19:21:53 +00:00
Steven Rowe b7739c81a9 SOLR-3430: Maven configuration: add DIH test dependency on HSQLDB
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1335336 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 04:43:44 +00:00
Steven Rowe 0f93e8d621 LUCENE-3948: move maven build (POMs and output directories) to top-level maven-build/ directory
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1335334 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 04:33:02 +00:00
Steven Rowe 7fbe52c74b Maven configuration: Remove out-of-place output from "mvn versions:display-plugin-updates"
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1329227 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 13:18:19 +00:00
Steven Rowe 57d8c13bb9 Maven configuration: upgrade maven plugins to most recent versions
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1329065 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 04:56:48 +00:00
Steven Rowe 0df401726b Maven configuration: Added test scope dependency to solr-core module on log4j-over-slf4j, to allow ZooKeeperServer to be instantiated from ZkTestServer.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1328971 13f79535-47bb-0310-9956-ffa450edef68
2012-04-22 20:42:41 +00:00
Ryan McKinley 835d0dcf08 SOLR-3358: remove log4j LogWatcher implementation
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1327608 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 18:28:37 +00:00
Ryan McKinley 967ca29f76 SOLR-3358: make log4j-over-slf4j optional maven dependency
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1327600 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 18:08:48 +00:00
Ryan McKinley e9bfa711f2 update randomized runner pom
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1327576 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 16:46:43 +00:00
Steven Rowe d9dc7ab247 SOLR-3358: Maven configuration: In solr-core POM, exclude log4j-over-slf4j transitive dependency from solrj dependency; otherwise, log4j clashes with it.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1327564 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 16:20:45 +00:00
Dawid Weiss 24b2c545d8 LUCENE-3987: added sonatype releases to ivy/maven repos.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1327552 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 15:56:36 +00:00
Ryan McKinley e34753cd57 SOLR-3358: Logging events are captured and available from the /admin/logging request handler.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1327210 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 18:12:09 +00:00
Robert Muir e8e4245d9b LUCENE-3965: consolidate all api modules and fix packaging for 4.0
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1327094 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 13:36:19 +00:00
Steven Rowe 9432411da8 LUCENE-3808: Segregate RandomizedTesting library sysprops from other Lucene/Solr tests.* sysprops, and use the empty string value to tell the test runner to use the default value for these sysprops.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1326780 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 20:08:59 +00:00
Dawid Weiss 1e86e9872f LUCENE-3808: cleanups to issues raised by the initial commit. Cleaner tests output to console, corrected output for suite level errors (duplicated).
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1326568 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 12:10:38 +00:00
Steven Rowe 8ad99c1a1b LUCENE-3808: Maven configuration: The lucene-core module needs randomizedtesting dependency independently from the test-framework module, since under maven, lucene-core includes test-framework source instead of depending on the test-framework module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1326466 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 02:37:53 +00:00
Dawid Weiss d5e276a53a LUCENE-3808: Adding randomizedrunner dependency to maven pom templates.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1326406 13f79535-47bb-0310-9956-ffa450edef68
2012-04-15 19:18:41 +00:00
Steven Rowe eae46487c7 SOLR-3356: Maven configuration: Add new dependency slf4j-jdk14 to solr-core module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1326213 13f79535-47bb-0310-9956-ffa450edef68
2012-04-14 21:34:28 +00:00
Steven Rowe 610d93357c SOLR-3344: Maven configuration: In Solr test-framework POM template, switch Jetty dependencies' scope from compile to runtime, since these dependencies are not required during compilation
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1311957 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 19:42:40 +00:00
Steven Rowe 33cdb0c9a9 SOLR-3344: Maven configuration: Add Jetty dependencies to the Solr test-framework POM template, so that those dependencies are transitively included when the Solr test-framework is used externally; remove the Jetty dependencies from the dataimporthandler and clustering Solr contribs' POM templates. The optional Jetty dependencies in the solr-core module's POM template are left as-is, to facilitate JettySolrRunner's use as a cmdline utility.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1311905 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:24:50 +00:00
Steven Rowe 56477c0b46 SOLR-3254: maven configuration: tika dependency version -> 1.1
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1311566 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 03:58:30 +00:00
Chris M. Hostetter bc700fa5aa SOLR-3302: Upgraded SLF4j to version 1.6.4 (hossman)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1311558 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 02:34:24 +00:00
Steven Rowe ac5372b8fc Remove mention of 'mvn -N -P bootstrap install', since the bootstrap profile is currently a no-op
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1310110 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 22:26:57 +00:00
Steven Rowe d0452d158e provide default values for tests.* system properties
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1309616 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 22:30:51 +00:00
Steven Rowe 3ecf4cd268 Add support for passing through new tests.* system properties
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1309468 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 15:50:40 +00:00
Robert Muir 755b86b429 SOLR-3310: nuke the solr-langdetect maven packaging
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1309191 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 00:47:22 +00:00
Robert Muir e00a7dce89 nuke relics of fake noggit release
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1308886 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 13:08:02 +00:00
Robert Muir d219d119e2 SOLR-3308: nuke the solr-jsonic maven packaging
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1308658 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 02:59:42 +00:00
Steven Rowe cedf1dfaa9 LUCENE-3930: Maven configuration: fix bootstrap installation of renamed lang-detect jar; make 'get-maven-poms' target depend on top-level 'resolve' target so that bootstrap installation will have jars to install.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1308456 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 18:48:17 +00:00
Robert Muir 8f0d7cc135 LUCENE-3930: nuke jars from source tree and use ivy
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1307563 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 18:04:43 +00:00
Steven Rowe 91fb08086a LUCENE-3937: Removed remaining references to the patched xercesImpl jar; added benchmark/CHANGES.txt entry.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1307165 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 23:27:45 +00:00
Sami Siren b5f8deb795 SOLR-2020: migrate to Java client that uses Apache Http Components http client (4.x)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1306800 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 12:11:37 +00:00
Dawid Weiss 3bbc27fc64 SOLR-3272: Solr filter factory for MorfologikFilter (Polish lemmatisation).
(Rafał Kuć via Dawid Weiss, Steven Rowe, Uwe Schindler).

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1306198 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:33:55 +00:00
Robert Muir ae0f44fcb9 remaining eol-style fixes to trunk, native except .sh (LF)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1305492 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 18:57:08 +00:00
Steven Rowe 3e64aa58de SOLR-3263: Stop including more than one servlet-api jar version in the test classpath in the Maven build
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1303516 13f79535-47bb-0310-9956-ffa450edef68
2012-03-21 19:25:26 +00:00
Steven Rowe d5683bea96 Align javax.servlet:servlet-api version with the Ant build (under the lucene demo contrib)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1303179 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 22:40:48 +00:00
Steven Rowe 681ae58f01 SOLR-3159: Fix broken Maven build
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1301764 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 21:10:19 +00:00
Ryan McKinley e24e7856f0 SOLR-3159: pom should only depend on the servlet API, not container specific version
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1301300 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 00:55:43 +00:00
Steven Rowe 8854531251 LUCENE-3795: Maven configuration: fix paths; remove analyzers-common dependency
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1300453 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 03:16:03 +00:00
Ryan McKinley d5b39f875f LUCENE-3795: updating to trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1300232 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 16:43:38 +00:00
David Wayne Smiley a29ad6dae9 LUCENE-3795 removed SLF4J dependency by logging to java.util.logging instead
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1299954 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 02:12:44 +00:00
David Wayne Smiley 0bcd64e14b LUCENE-3795 maven: reference spatial4j version via dependencyManagement
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1299522 13f79535-47bb-0310-9956-ffa450edef68
2012-03-12 02:18:21 +00:00
Steven Rowe 402496c8dd Changed jetty-maven-plugin documentation URL to the one covering v7+ (previously covered only up to v6)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1299430 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 19:19:37 +00:00
David Wayne Smiley 95d792f336 Bump Spatial4J version to 0.2. Also noticed added missing slf4j dependency in spatial module's pom.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1299334 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 06:47:52 +00:00
Ryan McKinley 2f501094e4 SOLR-3159: use jetty 8.1.2
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1299325 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 02:22:13 +00:00
Steven Rowe abaf382836 SOLR-3159: Maven configuration: Upgrade to Jetty 8
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1298247 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 01:09:16 +00:00
Steven Rowe 2510af4a99 SOLR-3204: Maven configuration: fix source file name for the solr-common-csv artifact.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1298192 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 23:03:56 +00:00
Ryan McKinley a6af5d8181 LUCENE-3795: updating to trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1297785 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 23:17:08 +00:00
Ryan McKinley 58e3736862 SOLR-3202: remove JSP support and the old admin UI
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1297578 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 17:04:19 +00:00
Steven Rowe 518f5fe688 Update Maven usage/build documentation
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1296722 13f79535-47bb-0310-9956-ffa450edef68
2012-03-03 23:41:38 +00:00
Tommaso Teofili 4a160999ba [SOLR-3013] - added lucene-analyzers-uima dependency to solr-uima pom
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1295765 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 20:09:13 +00:00
Ryan McKinley 166e6e9cf2 LUCENE-3795: fix license file (bad copy) and solr pom.xml
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1294984 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 06:36:50 +00:00
Ryan McKinley bb9b30bf57 LUCENE-3795: get maven build to work. Add spatial4j jar file to solr
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1294980 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 05:43:24 +00:00
Steven Rowe 092e348d81 LUCENE-3825: Add proper SCM sections to all released/deployed POM templates
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1294037 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 06:02:06 +00:00
David Wayne Smiley fbc539a298 LUCENE-3795 fix maven spatial tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1292939 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 20:19:26 +00:00
David Wayne Smiley 7234d8e256 LUCENE-3795 maven build (and removed old spatial contrib from maven)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1292161 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 07:30:58 +00:00
Steven Rowe 5f7a9a7a47 LUCENE-3811: Maven configuration: remove unused benchmark dependencies, and remove them from <pluginManagement> in the grandparent POM in the two cases where no other module depends on them: commons-beanutils and commons-collections.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1291795 13f79535-47bb-0310-9956-ffa450edef68
2012-02-21 14:19:11 +00:00
Ryan McKinley 4fab984441 LUCENE-3795: fix javadoc warnings, add pom files
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1291669 13f79535-47bb-0310-9956-ffa450edef68
2012-02-21 09:05:47 +00:00
Steven Rowe 634e115a25 LUCENE-3768: Maven configuration: include modules/benchmark/conf/**/* in test resources for the benchmark module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1290825 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 17:41:33 +00:00
Steven Rowe bade8e172b LUCENE-3731: Maven and IntelliJ IDEA configuration: fleshed these configurations out so they're functional
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1244275 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 23:38:03 +00:00
Steven Rowe d777ddbbae LUCENE-3762: Maven configuration: upgrade JUnit dependency version from 4.7 to 4.10
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1244266 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 23:15:47 +00:00
Tommaso Teofili d66d97790b [LUCENE-3731] - Creating the analysis-uima module for UIMA based tokenizers/analyzers
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1244236 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 22:13:34 +00:00
Steven Rowe eb0ab3d392 LUCENE-3753: Restructure the Lucene build system
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1241588 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 19:59:05 +00:00
Robert Muir 3d55e144ac SOLR-3056: support kuromoji in core
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1239117 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 13:01:44 +00:00
Steven Rowe 3df14f6b1a SOLR-2358: Maven configuration: add new solr-noggit dependency to the solrj module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1236855 13f79535-47bb-0310-9956-ffa450edef68
2012-01-27 19:37:52 +00:00
Mark Robert Miller 9fed484fb1 SOLR-2358: merge in solrcloud branch (watch out hudson!)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1235888 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 19:49:26 +00:00