intermediate commit to adapt code to Lucene changes

(not compilable yet)