Squashed commit of the following:

commit 0c29e5201af1360f82831f9766e8b492964d290a
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Apr 25 14:36:06 2012 -0700

    ACAD-995 reconcile a couple of java commits from tag

commit b04e8f68e862cc260952d318593fdc0b96fa6a84
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Apr 25 14:21:43 2012 -0700

    ACAD-995 reconcile QueueManager.java

commit 4d7510824302a48ebc7f567f6c50f626d6ca2837
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Apr 25 14:04:07 2012 -0700

    ACAD-995 reconcile header.txt deletion

commit 37ebc874d828db4cd71a4b0a0fb02e010e01be1c
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Apr 25 14:02:46 2012 -0700

    ACAD-995 reconcile license header diffs from tag
    Merge solr 1.4.2 community code

commit 2df3d880503112d1ad9b0dae5b3c461157ff60b9
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Apr 25 14:00:49 2012 -0700

    ACAD-995 reconcile license header diffs from tag
    Merge solr 1.4.2 community code

commit 1f3403e7a20c1654c809cd7d2a21d2643940f0c0
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Apr 25 13:37:41 2012 -0700

    ACAD-995 try to reconcile pom.xml diffs to tag
    Merge solr 1.4.2 community code

commit 34bb98aec525a410c0881b19aa0dc243c8f3b0e7
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Apr 25 13:30:27 2012 -0700

    ACAD-995 add parent oss back in to match community
    Merge solr 1.4.2 community code

commit 492a984a6f5d1b4ed73c28a708ed614723d6cac8
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Apr 25 13:28:21 2012 -0700

    ACAD-995 add parent oss back in to match community
    Merge solr 1.4.2 community code

commit 6fa4a8ab175e59ab942bad1fa0fe68cc59ad0111
Merge: 235ca32 23dfa59
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Apr 25 13:25:20 2012 -0700

    Merge tag 'org.sakaiproject.nakamura.solr-1.4.2' into ACAD-995

    [maven-release-plugin]  copy for tag org.sakaiproject.nakamura.solr-1.4.2

    * tag 'org.sakaiproject.nakamura.solr-1.4.2': (28 commits)
      [maven-release-plugin] prepare release org.sakaiproject.nakamura.solr-1.4.2
      SOLR-65 Update solr config files with copy from nakamura.
      KERN-2745 36483 SolrServerException errors during 1.1 to 1.2 upgrade (solr reindex)
      KERN-2745 36483 SolrServerException errors during 1.1 to 1.2 upgrade (solr reindex)
      KERN-2745 36483 SolrServerException errors during 1.1 to 1.2 upgrade (solr reindex)
      [maven-release-plugin] prepare for next development iteration
      [maven-release-plugin] prepare release org.sakaiproject.nakamura.solr-1.4.1
      KERN-2700 update *.core dependency to 1.3.2
      KERN-2700 update COMMITTERS file
      KERN-2700 update <scm>, solr version to 1.4.1-SNAPSHOT, core dependency to 1.3.2
      KERN-2669 Remove solr rollback.
      [maven-release-plugin] prepare release org.sakaiproject.nakamura.solr-1.4
      Adjust maven bundle plugin version to match core.
      Folow up to merge #95 Merge 95 would have been find for a single instance app server but with a backoff of 100ms there was little chance a single central SOlr server would have been able to recover before one of the app servers hit it again. The reason for the too many warming searchers is due to the commit rate being too fast for the master to keep up with and support the slaves pulling up new searchers and pulling requests. To allow the master Solr server to recover from whatever abnormal state its in, the backoff longer and increasing. Just hammering the master wont help.
      allow retry on maxWarmingSearchers exception. Prevents loss of index-in-progress.
      Fixed #93
      Fixed version of commons-io
      Fixed #92, fortunately no code changes were required.
      Added key sizing tests for a bloom filter.
      Enable autoCommit in updateHandler on solr master to allow solr index to be replicated to solr slaves.
      ...

    Conflicts:
    	pom.xml
    	src/main/java/org/sakaiproject/nakamura/solr/QueueManager.java
    	src/main/resources/schema.xml

commit 23dfa59c31229bea1edec5caad1fb2368e928c1f
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Wed Apr 18 13:29:19 2012 -0400

    [maven-release-plugin] prepare release org.sakaiproject.nakamura.solr-1.4.2

commit 3a272179f8666fe7d319fcfabad8820f26513c15
Merge: ad61c92 83e58ff
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Apr 16 09:19:11 2012 -0700

    Merge pull request #35 from thecarlhall/solr-65

    SOLR-65 Update solr config files with copy from nakamura.

commit 83e58fff421b41deb3e7d1d2a23af4dbd26c4a15
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Apr 9 17:19:42 2012 -0400

    SOLR-65 Update solr config files with copy from nakamura.

commit ad61c92b3f0ac6138cddc7cb126ca87931b7b333
Merge: 4de7c9a a35e75e
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Apr 9 14:18:42 2012 -0700

    Merge pull request #34 from lancespeelmon/141

     36483 SolrServerException errors during 1.1 to 1.2 upgrade (solr reindex)

commit a35e75eb7a93b6b0a935682e2d73ca33535bc5f2
Author: Lance Speelmon <lance@speelmon.com>
Date:   Mon Apr 9 13:18:51 2012 -0700

    KERN-2745 36483 SolrServerException errors during 1.1 to 1.2 upgrade (solr reindex)

commit 49a38d0f92115a545852bbe1b6c959022ddf0c04
Author: Lance Speelmon <lance@speelmon.com>
Date:   Mon Apr 9 13:17:35 2012 -0700

    KERN-2745 36483 SolrServerException errors during 1.1 to 1.2 upgrade (solr reindex)

commit a4e02c5d4f98747f8c258f3240466e408bb9f90c
Author: Lance Speelmon <lance@speelmon.com>
Date:   Sat Apr 7 10:21:15 2012 -0700

    KERN-2745 36483 SolrServerException errors during 1.1 to 1.2 upgrade (solr reindex)

commit 4de7c9a43c20148513a6534ea993b6e1db4f5901
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Tue Mar 27 11:03:12 2012 -0400

    [maven-release-plugin] prepare for next development iteration

commit 12a27448b90507456721fd9761782b0125d933d3
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Tue Mar 27 11:02:22 2012 -0400

    [maven-release-plugin] prepare release org.sakaiproject.nakamura.solr-1.4.1

commit 93f08cbd9332a6121fec44613d57d0117560fa35
Merge: 1caa817 8bf97e5
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 27 06:20:33 2012 -0700

    Merge pull request #29 from arwhyte/KERN-2700

    KERN-2700 update <scm>, solr version to 1.4.1-SNAPSHOT, core dependency to 1.3.2 and COMMITTERS file.

commit 8bf97e5856040253d9313feb9ed5dfc9b80908bb
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Mon Mar 26 19:20:05 2012 -0400

    KERN-2700 update *.core dependency to 1.3.2

commit 00554409a0839c22a591cbb58b0d0de393e09a2e
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Mon Mar 26 19:09:21 2012 -0400

    KERN-2700 update COMMITTERS file

commit d7068aa49d1fbee7a2b03cfa6cac217f903102d9
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Mon Mar 26 18:27:15 2012 -0400

    KERN-2700 update <scm>, solr version to 1.4.1-SNAPSHOT, core dependency to 1.3.2

commit 1caa8174c2238519954f42f2a84a2643efd1d5a0
Merge: 9f4e5be b3aa310
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Mar 23 11:03:21 2012 -0700

    Merge pull request #28 from thecarlhall/kern-2669

    KERN-2669 Remove solr rollback.

commit b3aa310099b42a37458c8788c544cb11b834fc29
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 23 02:34:53 2012 -0400

    KERN-2669 Remove solr rollback.

commit 9f4e5be8e5cede5877ec115ac888c468ed12355b
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Sun Feb 19 12:36:08 2012 +1100

    [maven-release-plugin] prepare release org.sakaiproject.nakamura.solr-1.4

commit 991715ec26693e28c6c3687749afb2ebd506d306
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Wed Feb 15 10:11:54 2012 +1100

    Adjust maven bundle plugin version to match core.

commit 14518651096b258de79513afc2b4af53db741b2c
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Wed Feb 15 10:02:07 2012 +1100

    Folow up to merge #95
    Merge 95 would have been find for a single instance app server but with a backoff of 100ms there was little
    chance a single central SOlr server would have been able to recover before one of the app servers hit it
    again. The reason for the too many warming searchers is due to the commit rate being too fast for the master
    to keep up with and support the slaves pulling up new searchers and pulling requests. To allow the master Solr
    server to recover from whatever abnormal state its in, the backoff longer and increasing. Just hammering the
    master wont help.

commit a0b640a9bce2e549528931343d602c4bb64a7575
Merge: dc90dfb 5744042
Author: Ian <ieb@tfd.co.uk>
Date:   Tue Feb 14 14:46:34 2012 -0800

    Merge pull request #95 from zathomas/kern-2516

    allow retry on maxWarmingSearchers exception.
    Merge Notes:
    Backing off should follow the same protocol as other backoffs otherwise the Solr master won't be able to recover under heavy load in a cluster or more than 2 app servers. I fill merge and fix.

commit 57440429feb06e9e1a683e7634b8720261c7039e
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Feb 14 15:57:19 2012 -0600

    allow retry on maxWarmingSearchers exception. Prevents loss of index-in-progress.

commit dc90dfba7e2e1f3152a74a44fb884d58900bd7de
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Sat Feb 11 10:18:51 2012 +1100

    Fixed #93

commit 07d18b23770d79a7520f144142f9c40d13bdfaaf
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Thu Feb 9 11:26:11 2012 +1100

    Fixed version of commons-io

commit 7e7dd7993823adf9bd5f9aaac95fcd21f5aa1baa
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Thu Feb 9 10:21:37 2012 +1100

    Fixed #92, fortunately no code changes were required.

commit ed51c117f42c728a6ca1b962405e3aaf0eeaf2cf
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Thu Feb 9 09:26:16 2012 +1100

    Added key sizing tests for a bloom filter.

commit 2d2cef077e08e55c01ccdb4cb6aba7a9e1591b51
Merge: 7f49a71 8270057
Author: Ian <ieb@tfd.co.uk>
Date:   Tue Jan 24 19:40:10 2012 -0800

    Merge pull request #90 from mawalsh/updatehandler-autocommit

    Enable autoCommit in updateHandler on solr master to allow solr index to...

commit 8270057745ab42fa9cadb9444848787a5001873f
Author: Mark Walsh <mawalsh@csu.edu.au>
Date:   Wed Jan 25 13:24:39 2012 +1100

    Enable autoCommit in updateHandler on solr master to allow solr index to be replicated to solr slaves.

commit 7f49a711134187e2923f643010c0f2ab811b89af
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Tue Dec 13 09:15:05 2011 +1100

    [maven-release-plugin] prepare for next development iteration

commit a3f00da78331c40745b664f1c5b2fb068ddcd621
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Tue Dec 13 09:13:29 2011 +1100

    [maven-release-plugin] prepare release  org.sakaiproject.nakamura.solr-1.3

commit 209a8bea875d7c01939fd06349967c55aaf17db0
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Tue Dec 13 08:57:39 2011 +1100

    Fixed #85

commit 1b89dc417cd0462b22304ddc041f25cf02273df9
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Thu Dec 8 10:10:28 2011 +1100

    fixed #86
    Made the API documentation more explicit about what to do in the case of no action.
    Put null checks in place in all locations where non compliant implementations of IndexingHandlers might case a NPE.

commit 0adab54c85cc05fe1f5d544b309ac721bda559f6
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Tue Dec 6 09:03:53 2011 +1100

    Addressed issue #84
    Code was confusing
    There was a bug in an event with a ttl too low was going into the slowest queue rather than the fastest.

commit 42a36f2edf6f25f0eb62a5a9075042c36a4864d2
Merge: 6a932b6 43a4d7b
Author: ieb <ieb@tfd.co.uk>
Date:   Fri Dec 2 17:44:53 2011 -0800

    Merge pull request #83 from marktriggs/soft-commit-event

    Raise an OSGi event for soft commits

commit 43a4d7b860d8ca0557667f12cf1e36ec9c075d31
Author: Mark Triggs <mark@dishevelled.net>
Date:   Sat Dec 3 07:14:50 2011 +1100

    Fire a org/sakaiproject/nakamura/solr/SOFT_COMMIT event when a soft commit is performed.

commit 6a932b663fdd064f86cd56f855d2062b143fd7c8
Merge: c17aa26 63561d3
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Wed Nov 23 17:25:58 2011 +1100

    Merge branch 'master' of git@github.com:ieb/solr

    * 'master' of git@github.com:ieb/solr:
      Added fields that are indexed in solr now that were being indexed only in sparse.

commit c17aa26460d0a4477eab7a758a3009f7e74b76d2
Author: Ian Boston <ieb@tfd.co.uk>
Date:   Wed Nov 23 17:24:16 2011 +1100

    Fixed #81

commit 63561d3a4173711dd50ed2d608302a4327879145
Merge: 766b86b 4c8322c
Author: ieb <ieb@tfd.co.uk>
Date:   Tue Nov 22 15:29:11 2011 -0800

    Merge pull request #80 from thecarlhall/add_messatestore_contactstore

    Added fields that are indexed in solr now that were being indexed only in sparse

commit 4c8322ca1c1f6fce98ee91eb08e59aafde5d197c
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Nov 22 18:19:12 2011 -0500

    Added fields that are indexed in solr now that were being indexed only in sparse.