2 Commits

Author	SHA1	Message	Date
Steven Rowe	4eeee5c147	SOLR-2452: merged with trunk up to r1130696; finished Solr contrib layout switch (src/main/java/ => src/java/, etc.) in the Maven, Eclipse, and IntelliJ configurations; restored two directories that were dropped as part of the layout switch: solr/contrib/dataimporthandler/src/main/webapp/ => src/webapp/, and solr/contrib/uima/src/main/resources => src/resources/; added jetty.insecurerandom sysprop setting to test-macro in lucene/common-build.xml ... git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1130815 13f79535-47bb-0310-9956-ffa450edef68	2011-06-02 21:15:00 +00:00
Steven Rowe	674feedec6	SOLR-2452: Merged up to trunk r1126232; adjusted solr/config/analysis-extras/ directory structure to match other solr contribs; updated configuration for maven and intellij idea. ... git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1126234 13f79535-47bb-0310-9956-ffa450edef68	2011-05-22 21:45:19 +00:00