From 8eb3d63e12af0a8c28406c13ea858d917d6a6a8b Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Mon, 30 May 2011 22:01:50 +0000
Subject: [PATCH 01/20] LUCENE-3156: regenerate forrest docs

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129398 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/docs/contributions.html                |  15 ----
 lucene/docs/contributions.pdf                 | Bin 24082 -> 24048 bytes
 lucene/docs/demo.html                         |  15 ----
 lucene/docs/demo.pdf                          | Bin 12300 -> 12270 bytes
 lucene/docs/demo2.html                        |  15 ----
 lucene/docs/demo2.pdf                         | Bin 15753 -> 15723 bytes
 lucene/docs/fileformats.html                  |  15 ----
 lucene/docs/fileformats.pdf                   | Bin 68988 -> 68949 bytes
 lucene/docs/gettingstarted.html               |  15 ----
 lucene/docs/gettingstarted.pdf                | Bin 8496 -> 8466 bytes
 lucene/docs/index.html                        |  15 ----
 lucene/docs/index.pdf                         | Bin 5933 -> 5903 bytes
 lucene/docs/linkmap.html                      |  47 +----------
 lucene/docs/linkmap.pdf                       | Bin 15886 -> 14596 bytes
 lucene/docs/lucene-contrib/index.html         |  73 ++++--------------
 lucene/docs/lucene-contrib/index.pdf          | Bin 24607 -> 21253 bytes
 lucene/docs/queryparsersyntax.html            |  15 ----
 lucene/docs/queryparsersyntax.pdf             | Bin 31192 -> 31162 bytes
 lucene/docs/scoring.html                      |  15 ----
 lucene/docs/scoring.pdf                       | Bin 24512 -> 24482 bytes
 lucene/docs/skin/basic.css                    |   2 +-
 .../images/rc-b-l-15-1body-2menu-3menu.png    | Bin 348 -> 345 bytes
 .../images/rc-b-r-15-1body-2menu-3menu.png    | Bin 319 -> 343 bytes
 ...-5-1header-2tab-selected-3tab-selected.png | Bin 200 -> 205 bytes
 ...rc-t-l-5-1header-2searchbox-3searchbox.png | Bin 199 -> 208 bytes
 ...-5-1header-2tab-selected-3tab-selected.png | Bin 209 -> 216 bytes
 ...header-2tab-unselected-3tab-unselected.png | Bin 199 -> 208 bytes
 .../images/rc-t-r-15-1body-2menu-3menu.png    | Bin 390 -> 391 bytes
 ...rc-t-r-5-1header-2searchbox-3searchbox.png | Bin 214 -> 217 bytes
 ...-5-1header-2tab-selected-3tab-selected.png | Bin 215 -> 218 bytes
 ...header-2tab-unselected-3tab-unselected.png | Bin 214 -> 217 bytes
 lucene/docs/skin/print.css                    |   2 +-
 lucene/docs/skin/profile.css                  |   2 +-
 lucene/docs/skin/screen.css                   |   2 +-
 lucene/docs/systemrequirements.html           |  15 ----
 lucene/docs/systemrequirements.pdf            | Bin 8301 -> 8271 bytes
 36 files changed, 18 insertions(+), 245 deletions(-)

diff --git a/lucene/docs/contributions.html b/lucene/docs/contributions.html
index 3544745073b..815ee2c3bff 100644
--- a/lucene/docs/contributions.html
+++ b/lucene/docs/contributions.html
@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/lucene/docs/contributions.pdf b/lucene/docs/contributions.pdf
index 352a0ffff4ff5a04573fcd140ecf5d5be1be3993..29682204e6f7c4a0bb0060120a43a317f3794fb3 100644
GIT binary patch
delta 2087
zcma)-&ubGw6vtWABHN@vqDU2F1tYYy_Pv>%otc;hk|wdBw*CUGP)pjT5U91L3--2W
zFH)R~{sDp~MRL@GS3x{`S3G#q|G>$Q+GL)nx82$I<MZD8zS*bmydQ79y(gm_Pzoi&
zX$apuzcOmRjh4-!vCAj?!unc1ZpNF9qF-pOZ{$mxanZaVt1!PXv;S@%2dwPldShp;
z)!dGo54MKg&X}c4CLylF_MHIrct7FI#>0M$&1R7S;xve94!2O|h01q{^8h^<YtfJ0
z^Xg#rLv>**U9OQHn3+h;n^r1ko~4BOl)9AdyY`IwHk0Xji@SS&J3rTISg1+|>@O6K
zWzY3$Bd%MF`u{i&*>;J>H}Zo>eaah^TG71B1nm!*@uQw-e>wRz?M3a6xs-Pp09gC;
z`S~N}+|*+a+pnfp&YJHF6XxQ=Ym;8M(9SNddZ#gvDuCdI9|SWs5lH>}g}3*vy%?Ef
zVPGQx1Y3dMeP9p*Cuf3dvvPYiiI9Afz??G>O1WV>QNgu~KoH*uq?;Zh(7kx+15S{U
zId<oGg2Ig|l^~gv)+Ccu(yazGMy@XdsUtUsM%D984v6e>F*gYVB}pqZC(sNuZG{d)
zJFnsCpwq@vozGe*w`UB|cuUz?iIRjsMe9+*?FB<-t}kU1ttbQ!-3SQCXr_?J3xQD$
zp&%Nvb?WY9#|E{D!u+&F2}Y43VTC@_D}*SbNYa$<W)lUjY?z&>J1GRsX(mOagh)lp
zP)k=zh*nG;%4D!8yKw{^dFajqF(gw)sX|hS9h^HI#@NtO+x%dE1}bt5QEEZXY_nW>
z*=A{a#)#HYaYeeIM8Zj{RYa&!N$xHbDn;%QRGO$4wcTY`5Zd;kdp5YWnv*R<9g-^q
zwfKWwBnhCFk*gWhs()P^+!lb^o;rlg?lO@q*vr8@TAsaEp5tY%OBkVIr3%V&wIs`+
nS*<!(EomqQh1$PNmi=PU--+w3c(>Kq@NGW?_j9@GV$J^rZh_Lz

delta 2214
zcmah~O-~b16itm7Gf;?8qXrk_q8JtEy>I5td$*}o+EQ5vDw-G<XbP01u^^UNu$#5f
z7~`z`0c><ZOjmyFi2p=aZgl0!#5bia?YpR5OlI!fkMqtsclzT~>h<T;tCz!|5P^KS
z0^<Ffo5QJe{B5{suDj_ubN!XhnCtmbX|8uhZ=6m$`D}A_Emy8>tu*VKVg1QQA;~=(
z?~Q`VnI0RDK;1*k0p;3Fa{&45_WEXSz7|$jt6{ZV4QmC{CyAAsHS^St2tb?yIrW$7
zzRW{0IQcHD_(OU$zBb}TCU12mXGXTiC9m(+o+gu%+eW?ckBOa(?xap#wy&MJ4eMc}
z*LtQA9<+A1*BiOmNuP*!MkZ9ZOD84i(ko3m_EWhJuALeG9+|p+NUfF6<>*MXSgsgp
zo{zbybnD&Nx#KC_`f}!LdPowHZoSQnq*@;*=7x>}fQXMwK1+$#i^)e9;=P6G_|(E~
z{C)mX>*vC9YTR>`cEMeATsK>huA<%pwl;3>9J?&d>*VKdxK8^<fbS_5lgf*)-d~PL
zvRBFrtQbf_-;VhZfE^1!3l>B0cuef~iw<ytQg}$QZvzCSH5*JISgj&JdoUpl)JBFP
z0ooe~CbW@2yBL*}HZuYUY{G#&2HNClyVfkaij02A??5etfKg2W+7udiK07ffX@eFh
z1V5bC9af{h!Gi3QAOLcJ9-|)tC9@d%%!&wt1_2uW1xjW(1Yg*?3k;YE5v1e*1G1Sh
zq!I_H6hs#NXuQA&Yo9Yi0Uu1l))>wAoJl7Dx)Mj-EkzW3ON}$xNzhX^Ktzf5=}_t9
z+c4-YL!sq`$m|UtjAnJLL@=?z)iJG6gJy%Z5Ip9wEkW%YIg|bCb3bYsFsgN6qc($8
zz^K-mZ4PScI=yFfBs}m|x$}`k5^T4TJZ)=-<m;|>J?Y|^2PY#W1q>2trals(Eub+3
z<IMaavb7K({60isvs!P|nod6NWaGz67at-OXT2g|NtTKws+20eC<i59c_j_ApbBoj
e^1qZNr%-UV!fG?zZr0Wu;|{HyOlJ00#rXrp^XFaw

diff --git a/lucene/docs/demo.html b/lucene/docs/demo.html
index 7ddf92a9edd..3d08c545997 100644
--- a/lucene/docs/demo.html
+++ b/lucene/docs/demo.html
@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/lucene/docs/demo.pdf b/lucene/docs/demo.pdf
index 48fff5805086d1138c5cbd4f117f53f95cedf8f8..b22493113ee4e1f4b4ce0a5eebda778108d1dba5 100644
GIT binary patch
delta 1327
zcmai!&ubGw6vt^1mCYtOh}cq*K}eH|A#ZkeW@nbTl3&|{icmc%QbV(aKw8su4?PIM
zvpEQJ(3=<0n^1$`A5r`RJQO^6^Xj1oo!z8yvr}<SGhg2KeLwG!?C9yw%~u~X1h7Ln
zWo57rKi$p9-<i6+n!9t^sCKs8up9OQ&!`SM+itBFdU7X!P5#Q=wv1}!R8!YPrMh;4
z{jEW_A9kPZ&Rfev%{E^fncLxM;Dcaq>hE<u3otGNEfaW%9hY)9CUyZPAgW^8d*X_a
zrmbSoX3TVc0;T3#l8;P~FU^8HG^zYyu3wtkCxwZ+$61g^+2!kJ1Rw15-NqnL#Lb9W
zj<PHDf0W$|!nWdR$AxD^O{I;d@5yg@G(O3Hxv&Uae!g<Nz{YQu%!P9RV2$4`pP2G_
z@rL}m`cb}Jt;qL9F4s%0%$0;ZE`oef`c5$-3<26O5UThT5oh)wi169NLPX3SV*GmT
zXmKr4qJwsk5nnLaU~3w+<>+R6$c3ZVJ6MI!^#IDF*m=zc4rz@6XkG@E;-B|2u%muM
zr6xcfM+;%V(tyB)r4OY309uFzB&A^xB;k$n)nO#saCH8{V8B*N17<rorD4@k-vR>-
znmKkF2E-7vw1_cg=`CPv*)$al0`tTqF+B*&(KW)gL4?iYero>N#2~29Rw$UzCQ(0`
z^cFyHp+PGoZL8`VknDFc!p2|`*{|H%tTAS@8Z@Zi<V}tV_eH~R)LT@2-dZgmJXHN}
b$rHo#jQy}Z2oDCqwxKpBs8J}i?)%0cC00Mx

delta 1405
zcmah}ziSjh6ea;tHus|vBZ5qGxkL^3-ptO<&T<|mxttb8C0b}9$&p;(;Bv;xBC$F|
z5DN=o3R^o1QP68_1pfg41%=dtosEL{X1!cCvoTIF%zXRa_kHiZ-Tl7uZ1wr82~dcj
zg**@Z-TSK(V|nv?VxIQh{1w_~3MJaF6(sGC3ztvky=tYmz7f@1+iSh{R@}bVt=ZT~
z^P>P1vsygU2XzZE0v#o!5kR%Fv$+*5wc_S_Gj7(KajQl=7F+1G=$0TH5NAQo{v$gT
zd8h}kx@XIL%NNY;oaj^B`dUPiiJX0WvvuDp+heC)J3?_7v8Oc5tEA}Y7`Nljh<dIQ
z?^Cm#%}!+A<Zh@vhT&t&FiNv*={Ei~mPDGDxwB>|U%YfkzLS$3$8bc;^#+aRW08&J
z2VaUGj*lan7pJ}+lUnO=@L)1GHh6OSSI*oiSIq0Fx8~8*IrFp}8Ziy#XIYz1<;bi}
z?@GZ$z<@1#j8z(v2{pPP6XEEhnb4yPA3U7-JU$Z;Vi)T&FF7Fi!p~q*neK&VUjt<0
zl~3XaI6#I0$sWXfdWl^u0BihUTmX{%yO^?keL_=4L&%5(pk0FyYMCu4470*q2uGMc
zyC9Wo^=Sn{p&LkT;|>Oa1nFRi$g^Dt>|E>`6$gP*t{KpM)GkPb+U){qC|4LX$5bVW
z8vRosi}{!-L`zKgsQ!J2I^dZWYQ-~^=#abJq9Gm9>TCxQ&`<N7u(lDnG|QEXD-bGN
zP&nTReM!1?j>_kA*x-$DQR1AevFd+A?s~PFw;eZo@lLO`;UNkxy;5oMdc*qzu;NZt

diff --git a/lucene/docs/demo2.html b/lucene/docs/demo2.html
index f5b568abfee..a4fdbb2b2b1 100644
--- a/lucene/docs/demo2.html
+++ b/lucene/docs/demo2.html
@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/lucene/docs/demo2.pdf b/lucene/docs/demo2.pdf
index 6be6790fe31b828d3227935af64d0343fa6dfd36..bd157873fff31350bc0b27f885d3e185b4b7d7c3 100644
GIT binary patch
delta 1307
zcmah|&1(}u6emSQHfeGQl}bTYFc%^8z4@N)cENn<K~Y-qAV>*K3XxcAx=5*qAb9bn
z%w5Ezg+k5Azrc$ZZyp8lBn6LN1ZUG!ni;8k+1cNFzmIv3eev|i?#nlM3Mjeaq6+L_
z??&GI%GXRhJ8!B*Iv2#9^(gJ7{caM(gU&{DwVx(tt#r}+EGiPji^rHfp6Im4PIr5K
z(A!FTk2a^N)uBh5?#;;U^w@B<`*_0d_Ywk#Rp3<$cTh%LMdQ>Fz)=v}G0{F^WsxRQ
z<DiXkCQ~e)9ba&@0Oon2V%`<F`C7PUa>cU6uXloY=iydVA9QVsMwa9hTc`7gdb69h
zt#A7jve}<KpBd&Sfma%>#C$4+qr=jdb2A`EALn1^b7J)1av^sH0LbV`<@c<)&90cY
zbl+^#MYGG4S>Q|Nn|;4$IJ(R4<#K2a#DxVKG7KSH3Bqu(MM6gYe(2G6u{V>W=9Mnb
zA%s>MAlwXt@d2r3=7V0J6Vk0Pqz0q%GFq)E4loeH#RO5VHV6vlnN=X3g3{nCP)1!<
z4bpth6trK_+`$kzx_!uOhD%H3p{HOg%2fbOg_{8x^Dxj%yYm7qsH=zeKeKDG&+x>^
ziJiF@T}pRINVxDY#<M+7tpk}r<zj@ZDellxkcfYnNa>{}O1axXqP=M$1)ocC+Boy2
zM8{rg%D@{n<^D~mAm%V$UXy}pQI}e_nnY+)<4S9+vl?v**{C&n62|{+xgR7+u${IC
T>CT|L5!lHI6;vwCTdm*^hUhs^

delta 1461
zcma)5&ubGw6ea~xH`#>ZrQl@*b5MzyH@|jfiNU5x?4csoABZRtk}U+%TGJJZ9`@`_
znWHFPrJzU-{s|s)^?&Fe;7Rap+9b_vQTOon&D-z$=Dlxb4`01`{q|Fy1_0D>b&axb
z2OIgEZ-3<*7{|pGd+1ZlE*8reZx$uSm&IEc-<2+492eIU->dC!?}oRdxYO&zon|MF
z>Wl(ZsI1W7K0ruKI1vvityMGFWB%GOLgxRlPau(NZE1PZ$%?&O;AuC#ZitOUbxeo7
zt?*v-Vww*6f9os-BLZpF6TIpPIZWezJeWzZ4&u2q+20<7_PW1pzZY~cRXK*FDl=-T
z80~e3{oT0#d}pdKLE1}xg`C1&z^CT>Q_yC!UH9$R63O|aap~u|C7`3vD<AV`q%lU1
z)-M-wqetc6zO9I=P52l4fM2ywgtliT*fG90_<8$5u#uLJbCMHo2ql{yA=S1dg3cB|
z1k4tO2sT@=(GPX7bVcFk^dURMn<T(>%6Doeu<uPbF@gI<fRav)DoFQPP@sYu<<=Aj
zcPFYicRRwGJkm?%ZBmU_KPwn;w`PC}r-toG^lPy}1I!%+K#B!if)o&(yDm_Z6$Bx`
z6~y256bFULHZ8L*7^M<d5FpU5UBCp(ObnX3M}qU3OijojqbHQmM{XtaTf!7%$SgQz
z6HPNsGXw6?0jC+a0I$a)_aWNP8MyWX=PWCT=j5C*aLJD+nGeF1wBy>1XKPI^nw+*8
w%xEEGqsgRRgO+Z$8mmB+tdrV5Ay2(}-P?;h!+3ufZFwM+(O$XSy3_Xl0Fh=;;s5{u

diff --git a/lucene/docs/fileformats.html b/lucene/docs/fileformats.html
index a3b5ea75e33..72d76b58e39 100644
--- a/lucene/docs/fileformats.html
+++ b/lucene/docs/fileformats.html
@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/lucene/docs/fileformats.pdf b/lucene/docs/fileformats.pdf
index 8acadfdc1a4a455526acf053d4536e7c10b88c0a..95ae0f8c7730aeac3dd77892cfa5c437dab0f7b7 100644
GIT binary patch
delta 4176
zcmai1&1+m$6erNCyrwM@)PkF_&{c@J_uPBVy?00_B$<vC6d}5jN=-8p2&T0r17;&{
z*V=`k+(n_FD1x|^`~zZfE2wnm!i|UsZQ8X`&ztW#C)7zG@7<hxK7QwSKIWf0$L`%Z
z_Gv!hj13r(7L5Pyi`P!%zfY{@#gk`p?UZ}2SZZ(9yW8EJPNP`bZEw|AcDjxH<EdAn
zSXvyu^W%gRKeju2o4ecByW8(yo4j`6^g^kwP0Lo7H@ZV(Z+1Qy+~3)5fU$PL;DR%6
z*-*z=?|ED|rtb(#40QKzRW1!w^&D;Xe0r+yR4=~PtjQnFp39%lV*YjZmAS$7zTimi
zV!K${zk0pCw%cLHnw4`;@I*-VufE>tZm=sGPq>`FI{Eza5e^KF)|;&=y8SxqzslMg
zOUwJ$H#XnvbZeb!?ek}M&n`EL{Mp^PgFjDy|I7>>e0yfS$$uVS`sH}OcjZRDym@QJ
z=D#*?KJ8yl{E2z5ed{<@kNMyBjeN6nYbNApw?3J%2VZWz^l?6YIG-Qh|0e%-SmYn>
zFXo>ftmHoqA*aKy^X&(8@WR8+3~T)8(Tnr0W`nPp+Imr|Ew+H)aP*e=jYe;DaQD&M
zv-1>E%~YS-wOY}8AR8;O=`)7e<%^H6lwj4rz(jF|0nmsuLng|*#`BMo120`N1fef?
zY3wH-CZ#a48Kux!kY^D<I&Dq<`SDyCwRvki2BE=1^jd=t>WnK|qG`QG*gE4X8|7pw
zEE><*oJxhIWR(###Ce{U3nnVVF`|Ub25TmQtLz(N6aNZ@U=k|BNhc7j1!)){MWxSL
zKVi6M7hGu-)C8zV3eGC19it_aPe4i^I86v9nCl_P@sBD2ocA&kf@qyY#$nWkqhcqx
zU}ZX)#9>lj4}Wl)T;z<(9k>)FwTXjMP<so?K?jq0@5Aq*R5>OGQIZS1OWLrb$w(@V
z;8Agb7*$C^@HD8~atuE?)FkvFNfMGHqZKBnQs;ED<32U$ECah0{^Wut4T4d*bFojF
zNzR~i+QFnbgFa{kQz}&?NSZX>kjgOzR1y0lN(^ICfp~yHipw$k$*3Mlp4*gUKiO#r
ztGrh%6mkx|kvww2_-TENKMN|-xWH{iDvYG249huXI7Zbm*%c!ZbTPVA3L}hkkX_0%
zttHe|Mr7VO43JQBM**#mMt!Cnj$zMCSAwJ)lJ`+n30IREI-Y~m`bd(sG@jQ_DTqc7
zB9>D<9Stb5B3QLFu$(GS<RM{ez5X}R1H4mP19J19CXF!|j+h$^mh5^6UTqiT(T%uJ
z4z?f!Uc&_!I7^C12+T|^r=Uh|q7qf|L2;`@NJ&OVK9V$oNA!8}NwrpVJOZVIRi4Bd
zI$w3s9{!^qfDU_G377QvEO>QBXjKd5Gc~p`cpO1JL^>dj11|eZC<Y=~IvAp=S>6nc
zEJYs1iv1X^suGM~B{En>cf@6{#wW95OqyXNk)rGY7=!Bb7~|B;XLJqMQnk2G?|+z#
z7EJbtGtjUmujV@@pHxL8nhd00f5=OTY@?W>uGy5lgpjy{%N+B7R@)Gd7q!BXDV=I6
zWPFl2Cf@TUgUJL{p8Tal%@Q(6wPj-d_5yi#g6YJY?3kIuZ%4d7iqawLM*Vx(zIkYq
zM35{}y#4#^%=ydE^ew-(7Qnbw*F?W&RxPe@oGYs<aG_-ywWa?Rd8cSJioNc}Zg+pT
RvsDoHMJUdlyYNP<_zx>5ce4Nh

delta 4219
zcmai1y>DDa5Z8qSq4QUPK%qgG!W5X`+1Z)d-NT$X<8um#kPH<cLKpiYS#m;ft_aoZ
zfFO{No=`-DC_thFAy=V+hJu0uBr4z^04cGkK``%pzPq=R2p86S`)23kH^2Gq-Y+*#
z{(bZ0hvggu=OFp80{Hc(&(Ad$%0K4T_5Ty|r^}xfK%W|m%liMZMb`hXES`I4p}DrY
zzjLv@F}S+Dzk6l4`^M$Yk^PU0@VI`xcIis{{9xGM=@0uG{o$a4;M`f@vk+c#t_`U@
z3Rm`*9#)tCEItzIAKCzGtCf>y_XoOt<l<gIpDXms&URa44LbT*CHCUr&Ev<t-FpNd
z#i)$c;@J0i-|CDzeH`u%_a?5pd&8;g*0oD}?egRKwQ%fV{JHWl*;aX*Md~QWk!AV*
z{G;Xa!qPK$*`MvPh>yFlwXvz_f3(y(vCu5LUp{#7!_s#TG}6I)r?)mvaY`v3{Qm0C
zr%nQZE5Ew%cJ+WIZ(na<`R(>Q_wkcZp5M9Nkn-1^(MMPI2iF^^{B!WZ38aI!E}nU}
z9NvNQ``cfX-yBN$`JMIh=Ixd8^x<daZ+D(LI6NFQ&iR%L*n-wpv(;MNWPS6KH>Ynr
zc@ur3$y?GlnY`h_Cx5*>zY<(*X_f%3%dO_<L0od`qP~W}Sf2U!LLp#2A%$#>1ICoC
zfjH;#HG+`)1HoYTdQGs(sF>yn;?X#akgP*b3RkTjh{$=}4!kpgW0p*zZX8g|D|Q%z
zb;w}WJdpOFmW-nWX3c|`7!0A%cGfpbA`^rm<sEb?JtjzuF-K7Cya}9u#>f;CnjoZT
z0w>!~bdK}D=)pj(b|DXp-epKD{(@pSiyjTsUg667se6-6#_~fsSPf1MY4jAN$QA`7
z=j1{!E+?U2^7$J2KzR^RWURj!kJpOHlzPi_BrrV|?<8*%l4Bbf4Ka~09S0uAEp+NU
z=9`fSb6CX_WSaqrt$uil1{qRT=SX|jk*(%$Myrsb&x42;vJR6G8u3>9kaf6C;4tM(
zF&0T=^f|2Jqa_XdN^@&Ti%*s_%+3TRFq|on#f+1XGweqW7D93{PX;-mDMY)OCxZf_
zdq?<BG(gCX4vHN`6wkTPcqYSsA5@q#wA4<fVpbfTQ9dB&J@!$|p`&)e1dfq&p&?+S
zqCQ$lr$VoAIfR5{<W>(hBcqC{=t*7U0+Cd(*4I$twBn<JNr_(BRrpWfC!xC;nv+dq
zuyGh^<go5fj098E#!nMGnm-1Jrjn>yI5ixV#DJXJF*>6GYFFJ_s=rBbI$(zVLIq*o
zcQrKQ#KBEx_V`{yl=Aa{RY3Bjh1eYBtgIeQ#Eo0`H|7daO6C+|45lujU_fTQ8qEMY
zDq8z!Sj8T!wCPPj%dZb1-$mhtk`Yx_JoBj*29q><GWyA$XJl+VgdFrh%(^BjV|jx_
zTb_fgdy`#LEz10H2w)ggglML<k~>482!{6@otY2T+hC3iM?G)yWFm3JpxO|!s)?y2
zs_vN0(cFJICUe?z0%s~tZq{x*gb8OCM?_KpEv!jJCQn9BATtX|Y#}Ka{p3_cJFWWL
zCx=h~j6(sv`(??9Uc7U(1jwj~fYPwqtMyN0Le<F<4uTm^fjD!FjDP7sGJ>pEH^T+}
z<x;zh_bRN#=^Zhz#Oa}7*2vDgN+902HQ#vp^<Fo2Id*}ZqmA`$FK+g_z4cArSQqL^
k-0Za0{@3KSW~bA<I_&Qcuk8;mHg(>DYc4PMUf68@2g=rQIsgCw

diff --git a/lucene/docs/gettingstarted.html b/lucene/docs/gettingstarted.html
index 29fc8cdc1b8..66cf752ef59 100644
--- a/lucene/docs/gettingstarted.html
+++ b/lucene/docs/gettingstarted.html
@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/lucene/docs/gettingstarted.pdf b/lucene/docs/gettingstarted.pdf
index b95fccb9e9e44855fa77db988170e2bb0cf6cea4..cd1bcceefd11c45d761830f2b92b3b6da7606406 100644
GIT binary patch
delta 927
zcmaiw&1w@-6vr9RE^d-$F)g%BNry@{h1mOj?+nR6XJVA92*#~KY^D&1wVe*7RHUz<
z9&{&|g<DaAAovt+guZ|q!B^19WGZcL#91BA{rx}Yd<<R%FWwXwCQ4|*>zIEU-YLMZ
zLI9+=1lQ)-B5L$@yriEDA|Ey4-mbSbNPM_muELM`>l8IM&v)r~flS9<bhs1u_mlq9
zz01=2sUf?}j>X;NJg^fT<oZG1r<jmB7IlUn5akK&WvxAoCq+^s_nxT6m2#`BXe;Y9
zHz}3=<1IKT*5F-H!1v-!JC{zNzswSBmoR)SEw9fAJ$|z9g>jU&ZH*hlvr;Aa2X;3~
zx@nhg2F{4eSNB_OAHI~G(OLQT6-$oJ7T#WkPGtk$uY7=`mCe!fO2@JYd|O?%*y!i#
z&|0L#!Q;=_b5J&5MKlbnwngD{_3;LExdCu3rgws1*jlrjTpBM_84iNFrUN7Ja?L*F
z%5Y%JaFtY=99MW+E4k9sJ0+=+t`w#jw|?OglDmdj3Jt`uo2IQ)=2@hkaXyUUwbOj$
zGEH%)2qA7D1)(C;(p4dDtI%z?T;@BC{~`~O@1w({8z;wcw2PDy6xC`s?zPb$Ww-AL

delta 1080
zcmah`&u-H&99AR{Qrff^kkC3!zVtB0l%MU|PNEW)HUthJq>Td?Kw-_KO5GS)BzmjF
z3xKc$hmFHt0D*ekfhXX^bMOpchqiR_03Uv`KY#yZzw3SOy?tK;fid`$ZvgpndcS5l
z@<*+w=2z#QnpYZaHE%YUnrY+iHOKC{`Cu=Iv!mU7cvuWy9E6T^>(}M?1}IM0Y)wEs
z!Z-jwC`|)^t~=g83?5`fI!KE&PKzv5J{s%inL3pS0gN|+ZT>~Q#JsSB-JRExem$Bf
z&R{oCab=Xg+R0w(RJ|Py!+)gB81s~w&Rw!o+hSOZ7S_?I_+yR6`=daf)NhNq!|Yl+
zEM(ek`3Zj)E1B|5eNApS&8-Xc6^;27v+voC6ZI{}O=LOKv*yoBmOnka`th=amMdSc
ze3Fk>ZcLxGcB~dfq=Nu$+X%S{Lxe33c=~Pi)LLg4fnMkU+2sZV!Q8+olONWePpEdQ
z&>2>y=P`z<VbK9$V2py{$EYq@@uQtmJ2}^r31Jes5yFXY@|bd}gm4C46%(8-mr?m@
z2|-Df$Qd!joMRIcW(fC)S;i-RHA8?!<tudSspt3m5kOxgIPN6S6Hx@QPpGG=37kYB
d>i(DV#12FIs7Ui-oM(Hs5FWAH?K=+>`xl>;2tWV;

diff --git a/lucene/docs/index.html b/lucene/docs/index.html
index 7c6f8b7c133..f1e9b244fed 100644
--- a/lucene/docs/index.html
+++ b/lucene/docs/index.html
@@ -133,15 +133,6 @@ document.write("Last Published: " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -154,9 +145,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -178,9 +166,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/lucene/docs/index.pdf b/lucene/docs/index.pdf
index 8e10347a7e3e399949f93b07ab1f4fce91766afc..b7228066485e8b66ab3786e5ec9685fa8422617e 100644
GIT binary patch
delta 773
zcmaivF;4<97>1*RLjg%ZjK-x=861$d*WUFmco8`2pvFXvn<gknLV}>j4Q%cXYW#H9
zA7G3zadI(na_~p^NAy5Uki*#N>)ZEzzo&PL=ZhDo5sgqoNTFv4f4E+Yz(=G2pRv^x
z%2f_5zvkCn8|A!8)ymg>8=l9P8OmjU?!nmS3dV}tI`C>oey!Q~9h*P-PStCHK9K(%
z>a>*opRHT&ajz&yGD2yFh>S+IsbL9eb+Ii%2D`sg9kyOo){6&UaQf(iPfo#7lt3ez
zhO4N6x9Cc;hZgeLF#`9o>DeKR+lNP1(Q^Z0r$Y_R*i7LM+q&zQ1D<l%IAm2%+H{l+
zH*x&<5`P*U5ztQTfSnXDmXz?GkdLh-9vK&ya!l|h!Z@omxSe=i&^1gt2RAV44n$B!
zLmH!SmfAnzrVKr4;R;R|8}xBq7hz56A<ZC0SYusnuAh@jEgUvETuv_S@e);1<_pZx
sm9B~<rc9*^N;T6EMMo8Focq_Zi)<UU{Ich_J-3PkCnid#OB)J(0Xk99Q~&?~

delta 841
zcmaix&r9P#6vwH@w24rEEP}$I^q^8ZGs$!^p^a4AtfGtH{x}FO#CC*YTWdOp+&p;m
zqA>Uuc<>}Bf`5Vk$R75z2T$Ie#MbQ^7jt+#zVG`!@6F5E()H5$X&O?5AT#MA#J3ll
z>69*irB_tE($`dc)N?A18$`u*<MV{Bl?p*)->LFmJ!p1C^RVOU^3qsaP?fOVb-r-n
zH+<n&eZgG}5z0f7hx8jl4rER|MsAHxD%>AqivC-0AS@Lk$ZEh<dyII0;9O?oSXCNz
zN6q4{N~5K|@}oi8YW`<<JR>qI$AI1MD-7XODw?A8imtT8Uo;5YEk};%pX60$nhq#^
zOGJ5XjflgSdf78}%BM`;f2a42KY8u`AK0#X@dH9fU97FH?v|Fru3tak0`N|wJR8g|
zyZYVb=>15_mOI%Wa%Rkyzq7Wy$&$P8V<2Ui09gQnZ4H2eN94))!#pzqj6To-TAV<F
z2uf(!lHG~DV}k8O$xI?FNbp;qRb(WgQB+K7CQWK2*5-!ywCo~F7#WpfviuWOs7Xzm
uRG5t|Oln?@u$3aE5Mqp~#B)LEL(8t_x>`^8fd~V>uMx{+S}s@H^0a3YL)ugT

diff --git a/lucene/docs/linkmap.html b/lucene/docs/linkmap.html
index 89d0b146fb6..2611d0c72d5 100644
--- a/lucene/docs/linkmap.html
+++ b/lucene/docs/linkmap.html
@@ -133,15 +133,6 @@ document.write("Last Published: " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -154,9 +145,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -178,9 +166,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
@@ -311,24 +296,6 @@ document.write("Last Published: " + document.lastModified);
 </li>
 <ul>
 		    
-<ul>
-<li>
-<a href="api/contrib-ant/index.html">Ant</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-ant</em>
-</li>
-</ul>
-		    
-<ul>
-<li>
-<a href="api/contrib-bdb/index.html">Bdb</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-bdb</em>
-</li>
-</ul>
-		    
-<ul>
-<li>
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-bdb-je</em>
-</li>
-</ul>
-		    
 <ul>
 <li>
 <a href="api/contrib-benchmark/index.html">Benchmark</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-benchmark</em>
@@ -353,12 +320,6 @@ document.write("Last Published: " + document.lastModified);
 </li>
 </ul>
 		    
-<ul>
-<li>
-<a href="api/contrib-lucli/index.html">Lucli</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-lucli</em>
-</li>
-</ul>
-		    
 <ul>
 <li>
 <a href="api/contrib-memory/index.html">Memory</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-memory</em>
@@ -400,13 +361,7 @@ document.write("Last Published: " + document.lastModified);
 <li>
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-spellchecker</em>
 </li>
-</ul>			
-		    
-<ul>
-<li>
-<a href="api/contrib-swing/index.html">Swing</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-swing</em>
-</li>
-</ul>				    
+</ul>						    
 			
 <ul>
 <li>
diff --git a/lucene/docs/linkmap.pdf b/lucene/docs/linkmap.pdf
index d05bc8e2b318bd499801d5247863fa11a0e2bf08..7d181ece2b74f2353fe53199073c8935cd262ee7 100644
GIT binary patch
delta 5000
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
V-nwXR2n|M27EIIDwqM{t`#=8DGll>F

delta 5618
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

diff --git a/lucene/docs/lucene-contrib/index.html b/lucene/docs/lucene-contrib/index.html
index b5164624c1e..dee3032c721 100644
--- a/lucene/docs/lucene-contrib/index.html
+++ b/lucene/docs/lucene-contrib/index.html
@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.1.3.4', '../skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="../api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="../api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="../api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="../api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="../api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="../api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="../api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="../api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="../api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
@@ -249,27 +234,18 @@ document.write("Last Published: " + document.lastModified);
 <a href="#Contrib">Lucene Contrib</a>
 <ul class="minitoc">
 <li>
-<a href="#ant">ant</a>
-</li>
-<li>
 <a href="#benchmark">benchmark</a>
 </li>
 <li>
 <a href="#demo">demo</a>
 </li>
 <li>
-<a href="#db">db</a>
-</li>
-<li>
 <a href="#highlighter">highlighter</a>
 </li>
 <li>
 <a href="#instantiated">instantiated</a>
 </li>
 <li>
-<a href="#lucli">lucli</a>
-</li>
-<li>
 <a href="#memory">memory</a>
 </li>
 <li>
@@ -291,9 +267,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="#spellchecker">spellchecker</a>
 </li>
 <li>
-<a href="#swing">swing</a>
-</li>
-<li>
 <a href="#wordnet">wordnet</a>
 </li>
 <li>
@@ -350,88 +323,68 @@ document.write("Last Published: " + document.lastModified);
                 You can access the current trunk Contrib repository at
                 <a href="http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene/contrib/">http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene/contrib/</a>.
             </p>
-<a name="N10035"></a><a name="ant"></a>
-<h3 class="boxed">ant</h3>
-<p>Ant task to create Lucene indexes.</p>
-<p>See <a href="../api/contrib-ant/index.html">ant javadoc</a>
-</p>
-<a name="N10044"></a><a name="benchmark"></a>
+<a name="N10035"></a><a name="benchmark"></a>
 <h3 class="boxed">benchmark</h3>
 <p>The benchmark contribution contains tools for benchmarking Lucene using standard, freely available corpora.</p>
 <p>See <a href="../api/contrib-benchmark/index.html">benchmark javadoc</a>
 </p>
-<a name="N10053"></a><a name="demo"></a>
+<a name="N10044"></a><a name="demo"></a>
 <h3 class="boxed">demo</h3>
 <p>The demo contrib contains the Lucene demo: IndexFiles and SearchFiles, described under
                    <a href="../gettingstarted.html">Getting Started</a>.</p>
 <p>See <a href="../api/contrib-demo/index.html">demo javadoc</a>
 </p>
-<a name="N10066"></a><a name="db"></a>
-<h3 class="boxed">db</h3>
-<p>Provides integration with Berkley DB.</p>
-<p>See <a href="../api/contrib-db/index.html">db javadoc</a>
-</p>
-<a name="N10075"></a><a name="highlighter"></a>
+<a name="N10057"></a><a name="highlighter"></a>
 <h3 class="boxed">highlighter</h3>
 <p>A set of classes for highlighting matching terms in search results.</p>
 <p>See <a href="../api/contrib-highlighter/index.html">highlighter javadoc</a>
 </p>
-<a name="N10084"></a><a name="instantiated"></a>
+<a name="N10066"></a><a name="instantiated"></a>
 <h3 class="boxed">instantiated</h3>
 <p>RAM-based index that enables much faster searching than RAMDirectory in certain situations.</p>
 <p>See <a href="../api/contrib-instantiated/index.html">instantiated javadoc</a>
 </p>
-<a name="N10093"></a><a name="lucli"></a>
-<h3 class="boxed">lucli</h3>
-<p>An application that allows Lucene index manipulation from the command-line.</p>
-<p>See <a href="../api/contrib-lucli/index.html">lucli javadoc</a>
-</p>
-<a name="N100A2"></a><a name="memory"></a>
+<a name="N10075"></a><a name="memory"></a>
 <h3 class="boxed">memory</h3>
 <p>High-performance single-document main memory index.</p>
 <p>See <a href="../api/contrib-memory/index.html">memory javadoc</a>
 </p>
-<a name="N100B1"></a><a name="misc"></a>
+<a name="N10084"></a><a name="misc"></a>
 <h3 class="boxed">misc</h3>
 <p>A variety of miscellaneous files, including QueryParsers, and other alternate Lucene class implementations and tools.</p>
 <p>See <a href="../api/contrib-misc/index.html">misc javadoc</a>
 </p>
-<a name="N100C0"></a><a name="queryparser"></a>
+<a name="N10093"></a><a name="queryparser"></a>
 <h3 class="boxed">queryparser</h3>
 <p>A new Lucene query parser implementation, which matches the syntax of the core QueryParser but offers a more modular architecture to enable customization.</p>
 <p>See <a href="../api/contrib-queryparser/index.html">queryparser javadoc</a>
 </p>
-<a name="N100CF"></a><a name="queries"></a>
+<a name="N100A2"></a><a name="queries"></a>
 <h3 class="boxed">queries</h3>
 <p>Additional queries for Lucene.</p>
 <p>See <a href="../api/contrib-queries/index.html">queries javadoc</a>
 </p>
-<a name="N100DE"></a><a name="remote"></a>
+<a name="N100B1"></a><a name="remote"></a>
 <h3 class="boxed">remote</h3>
 <p>Classes to help use Lucene with RMI.</p>
 <p>See <a href="../api/contrib-remote/index.html">remote javadoc</a>
 </p>
-<a name="N100ED"></a><a name="spatial"></a>
+<a name="N100C0"></a><a name="spatial"></a>
 <h3 class="boxed">spatial</h3>
 <p>Classes to help with efficient distance based sorting.</p>
 <p>See <a href="../api/contrib-spatial/index.html">spatial javadoc</a>
 </p>
-<a name="N100FC"></a><a name="spellchecker"></a>
+<a name="N100CF"></a><a name="spellchecker"></a>
 <h3 class="boxed">spellchecker</h3>
 <p>Provides tools for spellchecking and suggestions with Lucene.</p>
 <p>See <a href="../api/contrib-spellchecker/index.html">spellchecker javadoc</a>
 </p>
-<a name="N1010B"></a><a name="swing"></a>
-<h3 class="boxed">swing</h3>
-<p>Swing components designed to integrate with Lucene.</p>
-<p>See <a href="../api/contrib-swing/index.html">swing javadoc</a>
-</p>
-<a name="N1011A"></a><a name="wordnet"></a>
+<a name="N100DE"></a><a name="wordnet"></a>
 <h3 class="boxed">wordnet</h3>
 <p>Tools to help utilize wordnet synonyms with Lucene</p>
 <p>See <a href="../api/contrib-wordnet/index.html">wordnet javadoc</a>
 </p>
-<a name="N10129"></a><a name="xml-query-parser"></a>
+<a name="N100ED"></a><a name="xml-query-parser"></a>
 <h3 class="boxed">xml-query-parser</h3>
 <p>A QueryParser that can read queries written in an XML format.</p>
 <p>See <a href="../api/contrib-wordnet/index.html">xml-query-parser javadoc</a>
diff --git a/lucene/docs/lucene-contrib/index.pdf b/lucene/docs/lucene-contrib/index.pdf
index 1db16b319ee8399ba3965fb02b5e256dda068de3..6a8527bfc5b9621113ef2f5f4d3397e64645f145 100644
GIT binary patch
delta 12159
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
Z2xsvGFYp^b8v=`xz_9W2D{7u%`#;*4N^<}J

literal 24607
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
XD56@~kh~?JUnm3(JNsEV37Y>0JhVmk

diff --git a/lucene/docs/queryparsersyntax.html b/lucene/docs/queryparsersyntax.html
index fed92a4fa9c..a09bfdcc18f 100644
--- a/lucene/docs/queryparsersyntax.html
+++ b/lucene/docs/queryparsersyntax.html
@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/lucene/docs/queryparsersyntax.pdf b/lucene/docs/queryparsersyntax.pdf
index 79d61659ea2fb10638618d5eb446acdfc7e00912..11d2b922f09f43912d4fbc04b27924d972f317e2 100644
GIT binary patch
delta 2410
zcmah}O=y#85GGJ}^=sN5{J}+7KG7nIweQUL&ifN%AW3a|Py`hOL6+L48mV134QzYL
zX%Bl7UeE5qix&lnCl4OIdDvwaJSuqfrrw==iEZ*uV0-D8VP>A^nR(`Y_qp)ubK&8m
z$xMMIM>MDOi@z>ShEJ2Vpr($7<I~yUq`bCTYB$>(jY?8(t*w`;8|_M1n)x|=oIZ<5
zdH#EhKZi2;bFHzp+G;*%H-Ft6EuHI#veDdL@k;wU;I+nYgZhnT1r@-YqPa|62U{Xn
z%2}6`>J#CNLGON5kJ6x3PIMvX^h2Liu5qcT!gg^sJT6lBx43k0P~K16&09W|l(+9c
zDAijHCbrNcH=ap&KXoYVOdYF@A=qnhxzS!>LMwTTF<67p)rG}McsY}H|C_nJzhJuV
z=;;&uZ~c6+Frk#fZmYb!FTAe)S%9!y`{Mw3f6nut>;6;waxy%*dnSCn^E|w{GaugG
zbz!qv3e@yrUsH9THYW;P_3YkH$FkI8s?w`Tn$9m`>a*P+zWd?cksnWkOBqe6bTduz
z5412Qh7{7)YR4#%t+P0$$QvK!DXlaU89`D8GAm;gGvYkk@7LL*sjRgmijjpxAl7RZ
zJqqj%nK)*>(Q(W>9Eo+f4FK7ZV6U}zIwk{Pg<{B<b_BwCCMF0O%6^)#6OWJ+O{@g8
z@$nSUk`=X@Hyx2djS!1NYiQ8#=B`UXOT}m{#=8UU2fN!_9a^UZ>G1dOhdS1|7##?8
zJTl~62{n{Cp~kW8B85N%u{qK8E#F)3o<cGtfE{?joUE6?C_Dn>G4=?$jE02t@Y!I7
z4=7@dPM#SU@RA@Yu>zB25}2G2Vmj;`0c^xsfH5j|EIO-YLo4nZU35~pU}y6Qvi{xi
zqw{KLH2uj~1u-yK-e^o(la77F{aow?^lD_q`TY6vjBIGefY{;P<phzhBAx<juZ2H&
zOR*3n=!nMw30*t|q)Zx)v@j+Tx!4OxHj}^(`jZ)YUXi>KBP1_DjFOLy0V9A7%Bh-c
zH17rv5skKDPkf2O>Ba~Lqp@BBdkE#73%@MDqOD@JT4w{+tgq`TfWBC(^BdvoHRUR4
f`F~SxC6!9D)m~|}w_A<%1U)F5%+6lCvY31W=eH4`

delta 2474
zcmah~L5pKW5a#I)>YGXCr0lw|Jke2C8B<lSyQ@29gNd0as0izxghk>^b|%a0x@O;D
zJUuTS6hxr~L4>_}QY3=l)gK_}#sA<%Snt|zCNDGT%3=<WmrC_l-}hBj=a>7*pZAk5
zzgh=I1eeo`KtJAlb3JMJzt;QVxxI1T|IvW(_Hc76JfCms@Vwr9?eRw1X-)TTv<Kt6
zyVJ>?V)DW5?n(Y{%__gWd2tK)8e$t<`xv+l&}kjry3>AZT#WWc#b_`p#^KDr%?td1
z%vY!5kaLpvfO>C~fyv%(I{*f-v{P|<XZ&IPdN}D4AZ~-+UQwe;4jHwU`MK5^xbRv`
zio*qT@31(9&W>&!w*5C7SGY!)|6Cy~j#X%9O*-LtoasN`xa6N}Y`(JMd~`;dJvZd)
zU>HpNdNWHJv!6HLe>8EkC(mDgdQCg$>}>GzMl!qBd42610FeK-_h~}@+5RVM1n?5f
ze(L}8jQ{wc<$vG*-ha3Mg8$*b`gbSbpPD#-Z~rm>_W{m6o19CM+<$TN!bQv+WsqG>
zv#d3AnadYnX!h&PCmy-1Y!(UuWVf^Q_=Ol(#K`)Grn{vBk*!P|gGx!12MRb4S*ipE
z4a=B~8G#`<!7EQ`0$b4HFy(>_I}W0k3p-;?9AoEH9CKDL#mWGKXkaN=K|9Ma8AKL}
zF-M3MhrFsQ)o0NI%t_)Yt;^WLkmzD1sF-3Ghz*FdiWNqMNs)@hg|l{!SDrFdQZX^>
zxOb?7IdKuTxgf1k#V!y#TqYCzM@?3+4!slVw8FS0WPxL6P-`U!TDbzKjpZ^{Vu_>@
zOM;-y#mt~~S`y5y5MsdA1k1&eTDf*;h~nWQt8>v3lN(t$>|!Jijf&T}1hPh~2^y1&
z-dSb|$YS5gMk^N90F4u?O*Z`5W!3(jT@wZsD@H~u)G5u&gA}e-2N=&nh}jsAROnOf
zOj+NN%B(2DqIVRwBzA$6V=*5ZQ8=hc+!ZD19OD5Yt>nOIEe4ac!FU!(vyp|Z63%Fs
z2M3S+U)%u{?i8WUpuBtxI#JlrsjaoECSQ>kE|A*(Y&idmGNH;MSjSkpU@XbPF87x{
zy7C_FSRV9-cF^BZc7Xjs7%`=s?qQFs9(A+M|E63|yWR9|F`5=f)A5az9Oj&EZSA~0
GO#cHh6&MQu

diff --git a/lucene/docs/scoring.html b/lucene/docs/scoring.html
index a0326be5388..750fbeb5722 100644
--- a/lucene/docs/scoring.html
+++ b/lucene/docs/scoring.html
@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/lucene/docs/scoring.pdf b/lucene/docs/scoring.pdf
index 0fdf7919bd38b2805662105d5d4e6f74e129e25e..1c519d574e8b629e64e39bce78257fb298f60bfa 100644
GIT binary patch
delta 1870
zcmah}J8u&~5SFC~iHl7NghU8JCqxR6jAv#aw`<Hvb{tdi5>5&zAhHriGIAa`SEM^i
zO2oEQP=kbAqfqh_C=m@c9R*0NA2GSzLv-u$H}iepJnqv`;muLu<%@X+7zrgr8Tbct
zXWo3BZ<ybu+vkGX)@C*7CH-z3)CODI)p|dPO=aPd`En+tpjJ7K+2;wQeQtFRHV3`^
zq_?-5O)aNhS{6G>?j*;AYu#tl{C+PcKrDkOGg!x{DpYl>xC$^4ViD8YldO@XX{oW$
z=2+9Ii74yuytz>X(=RTYS4Cky7jK=NrcZz;aJ3ScccsP4ImCxM`_+{}*D7v~RGXdB
zQsW=6yWON?^>oI-9I9!k-E76?^+GuOxbXILK@2;KKQ9#I@Ch##<^X_(PsR6(=K9(-
z^Su4uJZM*j57+hzOBhNSLf8(%u+kEtjAlRB@Z0*2xvK=BO$P{f!(jX%6v(`o<mT6-
z%@oM{N1+=7Nh8usRp5ZijY-b99}~ilMU#5zUzwn|%mHd^FiWf?bM2s2<Jtx#g)0U@
z$c*UJmPU%mb!>r3JH$vzyCj5~WeSe#X+$?yMc|qvyXUFfR%F0)fZB7yFmeSFVdNQM
z%pX3Hm>NlETY`*px79?9Ja<ee*Buc@w=>8h^aXO2t!Mj>ObMS@cngP2YoAzhuQMFU
z?_kb|ISHM*bK=ZfI8<7BW75K(u?BFBpq4pfQnO`EXGcmZ%1PF43sFb@V(Og5v|kXf
z3wG6={jm2BL@qG_6JD$BUivs8eVoj}Man%{0&OqiUiP+a(CY%B{W3UXBD8ns#Tb|?
z8#gyZv(98oui&a!X`*P5Y_NJ=Y9{RkN4y?~wf{mM2XP!6B%MKWIOuK%M4F;td3p7I
GEBFIPm!qrz

delta 1887
zcma)5J8u&~5SArC;_Qn-X?PV!kpfWUnc2tfo{XjVML`gflLkQ)S&k!Fa$e3A?yjXm
zNcRJfphrS3C@4a~?|_nmDjg+zPMr95Ex^TUz4y&G-^_gT{-p5rr11825kf@JOg{qp
zl&%*Ge)^+WH|PD*t@Miz=Jv~9G3SjXVb0dl6LWUU%jV1wpO+x<z3O=HFnZRHyF1;u
z+w8{u8Uf-eh*bzT5hKviG(iMVtvJ~8_{OMjBL63P4ryZ3Uis!!&C^WDPA@Vd`ZaSM
z?d(Py{iE4+IQW~Y3~Uf4tTGo@nWHn;cn}XSsMm(^C3P^~8%F7y5{5H|^UoQ>MOenx
zKkkhNhw<QGe-=GOrl+OVU_opSpEcf}fjZ50%}<kZQ1B=3${(&5)TD9y_noUkYpo_#
zUMfu1#m{?baifxMbv~x7^KcSv92D-dK*|7uju!-#wg_Z+@dqd0HcziS5D-B23-$wV
zdLa~?Id3vdzrW}ujGQlu+ixIAo1{5b;J}srCb{J9n-b2OfHS`2QYI*_7XZl=m`|*v
zw97%@%q|<0RJIrdp>v|^h8igpcEt!1wUro2lbwW6r}%O?(Hw2G3YlFF5pcVY$RKoa
zNRD(yU@Ia+I8`p^#*K`*<0ewJbYwg|dbOM|k?Tm-5GK);#JS55a#xZ-mrp5sibUef
zQpvn@4rKR{NQO=?I0{$bf+=!Rwm{@OXDO54RICA=!D!(QRRgmtK^-m_jB@-)q+vm9
zLXJYMT<_@x-UD#E0O)wxctqHV379(T^xOs-ce-;j8{>=w<N};Rdn=7$-4#H{ccEh1
zPl!&%gvPVhPLc6;dTsmhwxU*(qynZ%v^ZnUR^6Dsu5@!vHyYHg1=W8-w!B)+JC3`f
Tcs%OwdS*N#^j20{&)eP~@gSY8

diff --git a/lucene/docs/skin/basic.css b/lucene/docs/skin/basic.css
index 4ed58b99ae7..eb24c326c6c 100644
--- a/lucene/docs/skin/basic.css
+++ b/lucene/docs/skin/basic.css
@@ -163,4 +163,4 @@ p {
 .codefrag {
   font-family: "Courier New", Courier, monospace;
   font-size: 110%;
-}
+}
\ No newline at end of file
diff --git a/lucene/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png b/lucene/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png
index cdb460a1da7304fcc2d5e326db43e27c6fa9b025..1c6f6d9ac2fab6392a6d58dca503965491d975b1 100644
GIT binary patch
delta 234
zcmV<G02Tk-0@(tPcYn=EL_t(|+GF&|>Hp6_CSYP_W?~>)GdBl2`I@E01<BWJuBXJn
z#>zsTW-C1v1|~)_ZI%=jV33gzCQmbn$Ov^{U}s|`PqVs$B!jMsGy^LOGwGT^pghT&
zL4cPF=zk{CHFL1DGPLFfgK1(7Kv4w>ya{EI48j83M0o+j3S*D~)2ibb^wneu1|rtf
z0djhMW&p#@2hSO1tUkc-<i%Ttf57bX>-QhRnqdGG3;m^$49{PGU^sT^4#UYy_ZXhO
ke9!Rp$4`d8fB!K60MA)0#iM-YS^xk507*qoM6N<$f*2%f00000

delta 237
zcmV<J022S%0^9<ScYn}HL_t(|+GF&|>Hp6_CSYP=VP+s(GY=O#`I;4_M9J4|sjtky
z!Ny9SW>Xy{hQI&*k*8TifQLa{QG$Vqk%@H8AR;5wiGhukOwIC=!VJz9+6)}*tfXrO
zfz)7o1_@z)1{P*!(ls+PF)`F<1~7o)omc}<JPHcD{<0_r8D?=oqP&0+N+1I!lt(c*
zn`<$!v$5cf1*|e4FJy!|GW3>2GH57CGB7hUVNFOZ_?!ibh0cOdhBqI+Fr2<}kKxGq
n+YFChyk+?E?I**ZKYtkj+WaLkdEpex00000NkvXXu0mjfJwIq*

diff --git a/lucene/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png b/lucene/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png
index 3eff254fd179852394e8bd960eb1f610f05f2d4f..643bba4ea4695a61c41ed6659929d2be21e13f88 100644
GIT binary patch
delta 232
zcmV<E02lwi0@nhNcYn)CL_t(|+GF&|>Hp6_1`rY8VPIk)6L7Gzk*`^hkBfZGGU7ty
zY3AZ!V=z#cBTw`1KYtmFH04Rx%*@QhV4<fB3@}#GHM6oXGbH%ifY~HzW@lqzaIw&4
z5EJ4fO*0G7xpI=i3@Jf&2r;5GvM@35a&s~?WCSoUGcggb8DZp9X)!^DhRgs4J|0d~
zLvd+hVq|1sWo2QoF;r#9jdDS;5vOL5P5*&eMN3JFAwARqoRV;Q2jVAY1|BYUu=5;D
iG#E^@6~VcN5C8yi+!ZK%<ct6S0000<MNUMnLSTZ^fnhZO

delta 208
zcmV;>05AX70>1)~cYm`<L_t(|+GF&|>Hp6_CSW30BMS>N`I@=d*~r%{D=9>tW;Qk!
z26G)HGHnJ1v4x&8d771^MHwVT1xVM-#>&Ew7V1EHRI#$KFxVQZGN{Ullct%8k&!`E
zkcS~7%!#x_0@5fVz{Aj-6U4y5&WcDV#5h$<h=-vmI|xYgp-HAPLV*MFBgm=9HsaI_
zN&t*Ns3;}EkP>XipspZ^JAK0vIVi14iwiPX0wW)k06_6b2mk=Wh7lfZ(09lH0000<
KMNUMnLSTX&SXiI{

diff --git a/lucene/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png b/lucene/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
index b175f27b16e19464241853fd16c8030d649b6d4a..26d75656389fdcc30c035ff7c8894cc0b493daa2 100644
GIT binary patch
delta 93
zcmV-j0HXiM0nGuBcUD13L_t(|+GF&|>Hp7w1VjXQ7?>E)fQ+~hsvrkDD}$+yB0`Xz
zjTNlQ+fJW>1tcIU$jjhps=*NDZOOpQ#KZsqQtk#KN~?yC00000NkvXXu0mjfvcM>C

delta 88
zcmX@hc!F_4d7zD_i(^Q|t>iB!U;aPez&7IoE6a}^0jx7;&X8F1HB_)kfzi<}uZ^W%
snoVqjSezakcdcmK6NYFuzOpbj2CHh;N8AF9@eDxV>FVdQ&MBb@06OCzRR910

diff --git a/lucene/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png b/lucene/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
index e9f4440d1f58d53fa16a2ea141bd04cb69f0a595..b10c0cdd589d7b25723fc8001a1bfe409195bdeb 100644
GIT binary patch
delta 96
zcmV-m0H6QI0nh=EcUeS9L_t(|+GG3=1Pl!S8NPge&+z^G7lyxoe>1Rv1m3)U%<%j7
zPX@3&5HNlE^cE=a3oZZ_{Qm7TP~aZ}GGGFkferxbxhUwy{XVt;0000<MNUMnLSTZ1
CJu5c=

delta 87
zcmcb>c${%Ud4RR2i(^Q|t>i!aZ2u+f>Z^`_c>6oOt-ikActZory*+hjK0H6K&$d8^
rnZuwlM1i}3)iG)U>wzW(;|q)op>{gY|JNUT#{dMLu6{1-oD!M<t0W|S

diff --git a/lucene/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png b/lucene/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
index f1e015b36c399a2d3a5879d69c3f31a82ee9f7bc..c300582e59035061db5866ef0349cb8f210cb6da 100644
GIT binary patch
delta 104
zcmV-u0GI#K0oVbMcVSFPL_t(|+GG3=1b_eiW7xF+Jj3C0w-{c&{lvfm5-90i$?)Xm
zJBA-We=~pp%d)M<86LlQ$MEwPL;wVs_Mg6iA^;YA{r)opIsgDDl_;j!<Xd(C0000<
KMNUMnLSTZ5c`v~L

delta 97
zcmV-n0G|KY0nq`FcUnbBL_t(|+GG3=1V4WMW>~)cB*WozHyK{P|IEMw5-9Co$?)Xm
zJBB}h{xN_66G+9=m+#>MU_p?U-+%rxAOj|l8R!52AaE$5b4BTy00000NkvXXu0mjf
DxOFP$

diff --git a/lucene/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png b/lucene/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
index e9f4440d1f58d53fa16a2ea141bd04cb69f0a595..b10c0cdd589d7b25723fc8001a1bfe409195bdeb 100644
GIT binary patch
delta 96
zcmV-m0H6QI0nh=EcUeS9L_t(|+GG3=1Pl!S8NPge&+z^G7lyxoe>1Rv1m3)U%<%j7
zPX@3&5HNlE^cE=a3oZZ_{Qm7TP~aZ}GGGFkferxbxhUwy{XVt;0000<MNUMnLSTZ1
CJu5c=

delta 87
zcmcb>c${%Ud4RR2i(^Q|t>i!aZ2u+f>Z^`_c>6oOt-ikActZory*+hjK0H6K&$d8^
rnZuwlM1i}3)iG)U>wzW(;|q)op>{gY|JNUT#{dMLu6{1-oD!M<t0W|S

diff --git a/lucene/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png b/lucene/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png
index 29388b5efc9155a12ec75c7ea12940bf45d5b3fc..d667b6d0e144b1e3e4204d5fe74facd5b2b50af0 100644
GIT binary patch
delta 281
zcmV+!0p|XO1BU~UcYpgyL_t(|+GC6=pYflajfFvgmy1D3MwG$IK$Ss9MVf()m4$&2
zVEOd*I|IX428P$~KQr8Z^pfGo`CAOX|NLWcvCv|O_OfK)<Ke`qnOV)uqXAjq_n*HE
zfB*esc<}5E!<NGr8UFqI4|WMQz=X?GkRjiH{9;(M=QKmhtbff6KYsouUNa1UG@ZZk
zkfFF|1%?3xHG{yf-+vfhy#2_~vv3FLnqdZ9y!D7-<&IONYleAY?cOsCpT2x2T{8&$
z0S4sKZO6&e42p$4C$53LL9%8LU}a%qxN_$yd78g||HW|n%02QlgTRxQ@5$Hv{?k|T
fHGlp7lK}vv6%ud7<{U-t00000NkvXXu0mjfOUaW8

delta 280
zcmV+z0q6dQ1BL^TcYpdxL_t(|+GF&|>Hp8d!py+M&c+}sDa2r@r@~;SqsSmBD!@Pp
zuz-j^fBrIj`tzOP>Yb+yw;#S_Sh(p3gQ~m)LrRbxgQ}c3PR-0}W*!a50)PMgWBB*)
zKf~+ypBeU_zQOR~^#=w6bvXu*>(BucK4<;<{fFV;*;@<+U4Kg%UcLK7nr0CA{pSzE
z^Vc64O8Zt~7(h@n2>kp1pW(x&Zwz%)*D?I~`I|J&Faut_`@%45&3@7~!@K|rgL_Y2
zldc&Sh|^c@BTq93+<W>O7>FOp)6Brgz;NQyUGg;l`t^t5<du75+6)AbpT8qt^S7VB
e$kz<YOaR|PYY~}&Ta11H0000<MNUMnLSTYFeUc*p

diff --git a/lucene/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png b/lucene/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
index 944ed73333d834f3509955d65fecc604393bf626..060a3cbb5ecc3d7b473a8c569850cecaccc70613 100644
GIT binary patch
delta 105
zcmV-v0G9vO0oehNcVbORL_t(|+EvNH3V<LGMbTGSkV1jW{{ORD*S=6khh|DBqPsk|
z+15on(_?TWtesFZA}4Z5U?va+ct4}Xlc=KH7~}roJ18B0tTAU?a&{q#`eJ$Q00000
LNkvXXu0mjf=KU@>

delta 102
zcmV-s0Ga>U0oDPKcV9|LL_t(|+GBkB<mP{7W@ZKsPF@B+J`n~+MkWR(1|azR_b<b@
zFCQ6Rzk0~<|NlRTAPD>i!oPq1Fns#-1|bNO`0@QSsvyiL0MqgxB>9U}@c;k-07*qo
IM6N<$g6mW)v;Y7A

diff --git a/lucene/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png b/lucene/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
index c4d4a8c7ce3949f429260afe8178d18cc0f6e2c2..c368069cb016f8f7d68b9c1a2dfb54ab12018d31 100644
GIT binary patch
delta 106
zcmV-w0G0pO0onnOcVkXTL_t(|+GC6=pYdNtLXg45LYu)Ah(Unm)7S3|*Y192xcB4@
z!|5yc7^+fy8JHNL;K$Ej4Cik=X4rf38bS~zarDA%R6!89|Kv3T03Symz*!D$RsaA1
M07*qoM6N<$g5<L>IsgCw

delta 103
zcmV-t0GR*U0oMVLcVJ6NL_t(|+GF&|>Hjal$Hib{pvDmIXU)LD&dR{V00bXCePh^u
z<Pt+(=Msh=KYv36LE!Jde+;kQer8y>=_o=FCUNA#EmT36Q2<>K9n7(PR;~a5002ov
JPDHLkV1im(F2?`>

diff --git a/lucene/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png b/lucene/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
index 944ed73333d834f3509955d65fecc604393bf626..060a3cbb5ecc3d7b473a8c569850cecaccc70613 100644
GIT binary patch
delta 105
zcmV-v0G9vO0oehNcVbORL_t(|+EvNH3V<LGMbTGSkV1jW{{ORD*S=6khh|DBqPsk|
z+15on(_?TWtesFZA}4Z5U?va+ct4}Xlc=KH7~}roJ18B0tTAU?a&{q#`eJ$Q00000
LNkvXXu0mjf=KU@>

delta 102
zcmV-s0Ga>U0oDPKcV9|LL_t(|+GBkB<mP{7W@ZKsPF@B+J`n~+MkWR(1|azR_b<b@
zFCQ6Rzk0~<|NlRTAPD>i!oPq1Fns#-1|bNO`0@QSsvyiL0MqgxB>9U}@c;k-07*qo
IM6N<$g6mW)v;Y7A

diff --git a/lucene/docs/skin/print.css b/lucene/docs/skin/print.css
index 8916b9fc01e..aaa99319acd 100644
--- a/lucene/docs/skin/print.css
+++ b/lucene/docs/skin/print.css
@@ -51,4 +51,4 @@ a:link, a:visited {
 
 acronym {
   border: 0;
-}
+}
\ No newline at end of file
diff --git a/lucene/docs/skin/profile.css b/lucene/docs/skin/profile.css
index ca72cdbd10b..2ed95546ec6 100644
--- a/lucene/docs/skin/profile.css
+++ b/lucene/docs/skin/profile.css
@@ -172,4 +172,4 @@ a:hover { color:#6587ff}
     }
       
     
-  
+  
\ No newline at end of file
diff --git a/lucene/docs/skin/screen.css b/lucene/docs/skin/screen.css
index aa8c457cb30..c6084f81df3 100644
--- a/lucene/docs/skin/screen.css
+++ b/lucene/docs/skin/screen.css
@@ -584,4 +584,4 @@ p.instruction {
   list-style-image: url('../images/instruction_arrow.png');
   list-style-position: outside;
   margin-left: 2em;
-} 
+} 
\ No newline at end of file
diff --git a/lucene/docs/systemrequirements.html b/lucene/docs/systemrequirements.html
index 4025906ff9b..d3fae2f7e4c 100644
--- a/lucene/docs/systemrequirements.html
+++ b/lucene/docs/systemrequirements.html
@@ -133,15 +133,6 @@ document.write("Last Published: " + document.lastModified);
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -154,9 +145,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -178,9 +166,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/lucene/docs/systemrequirements.pdf b/lucene/docs/systemrequirements.pdf
index 1450224147807670d3944313d79130ce188f2d4e..ecb9b405835d5a184ebefb7d31ad340ac8c14805 100644
GIT binary patch
delta 975
zcmaiwPixdb7{&>xhuMFJR&i@v)5GE)T>8#TW+oG2Xx433P!X))slwV#VPWl`G>7%H
zU!in7TlxhAi6_5=AbJ<^s24whNj8;jX2CfP&pglb{@(e$@p<F;ZG{3B%x1g|)`!!_
z74@sqQBb?C*6Q>satAw3Jd8)7humne>-eMCQ@zHj`dPn6kh^}arPmo}dL4vEJJIkU
z9`5g5jJ79Q?4mad_v7<{Tj61m9}PVM7`K77DLlu*VYZV~I{;IV)KPR#QyEfGm4kM3
zrYlpZe8*lD)VSJG@2X6Ft@aj*_|*8%_wW{S$FC2Z2T_=Ubu+m6B<g!@QN5|%=*$7k
z3Z8^<KLzUN6?0}4(z9;hsgDga`PO)J$>7P_;>l%oymVLnXuelTb3OUAv}G7r)t8$F
zO>Qrr8FvUbAv@-tiSi3@DREg7n5aK1uO=Xw_CzF<HA@nrX<%s@13k+y*2XhT^Xz1n
zQ&6TCVqN3F?J^7_w!SwJvg{KUon7ul{zHO+C>uGET9{K?*DRZAS*HBeg=^`*YcDod
zUvA!i2~6@p;vf*h-wb?<$iSAe11xRxq1*9H_rI2H<ay{Q?nm)B3U`rUOrTb4^J#$o
E0)D~vH~;_u

delta 1034
zcmaiw-D(p-6vtVrH<Rq<M!~dN_a^v7$eEd)ncXE_VzP}FRRrs8g|*p2AgOgb7rDz5
z6vR;k5yTe|B!ZVdLND|!MDPuCHXk+aq&OFc!<paze?CrIKU*(el|Wz&0fjq2KE1zR
zvTXIE)Yh?HzM{U_ptCinrsGYA>A2_IyKJLoBkLW6aeBO;^^au#*<m!}Po10(D;qTs
zk1-A*2&cv&K(jF#9)%B5ne-Bw#EDF`=C@N7=a8K&)y#}Lr{B(4Ptw~DwV^gc&3vZa
z^!Xwk^dkZo*MZen^vGdNEOwde8cTLMm3=ulv%Wi!f34loa1g4u<t?#rn1AOEXR_RF
z`AD-Fr=&V5Z>k%1rL{s|(3r=bALLQo)kl0&aV>lDrLuFu3MOlpUS3qg^@jRd{it47
zZ%^K>?^+gBzc#8Co}jBAtXqt`kU#g(MbiWX5Ny;iQ{S&W9b>|bFG`?T^8!YU8VIAt
zu&HI(GukuEr`qv9b5ehWp;_Y)_{Cuu#m3&8LQv#{$CsDW{q+-!iXzA<F~r=%W{qKL
zXt{Y+E~sa4zU8UU*SDU;%<B-`4yYef$~x_iCq%m|I1z&T+rAgM&Ho~MD2mXrOfosj
Q(gP%zFHo(v{jiJv0B6_ybpQYW


From fd7d6e19fc24e517d5269576a102869efa03be0a Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Mon, 30 May 2011 22:17:41 +0000
Subject: [PATCH 02/20] LUCENE-3154: remove version references from the
 versioned website

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129403 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/docs/contributions.pdf                 | Bin 24048 -> 24048 bytes
 lucene/docs/demo.pdf                          | Bin 12270 -> 12270 bytes
 lucene/docs/demo2.pdf                         | Bin 15723 -> 15723 bytes
 lucene/docs/fileformats.html                  |   2 +-
 lucene/docs/fileformats.pdf                   | Bin 68949 -> 68949 bytes
 lucene/docs/gettingstarted.pdf                | Bin 8466 -> 8466 bytes
 lucene/docs/index.html                        |   2 +-
 lucene/docs/index.pdf                         | Bin 5903 -> 5903 bytes
 lucene/docs/linkmap.pdf                       | Bin 14596 -> 14596 bytes
 lucene/docs/lucene-contrib/index.pdf          | Bin 21253 -> 21253 bytes
 lucene/docs/queryparsersyntax.pdf             | Bin 31162 -> 31162 bytes
 lucene/docs/scoring.pdf                       | Bin 24482 -> 24482 bytes
 lucene/docs/systemrequirements.html           |   2 +-
 lucene/docs/systemrequirements.pdf            | Bin 8271 -> 8267 bytes
 .../content/xdocs/fileformats.xml             |   2 +-
 .../src/documentation/content/xdocs/index.xml |   2 +-
 .../content/xdocs/systemrequirements.xml      |   2 +-
 17 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lucene/docs/contributions.pdf b/lucene/docs/contributions.pdf
index 29682204e6f7c4a0bb0060120a43a317f3794fb3..3d205539a1f3ec10e3843eeec200cf04e30bbfe5 100644
GIT binary patch
delta 152
zcmeycoAJYL#t9QyEey>JOgB!u#lvo4WoTw)V7j@ScP1l@Gg+M9494CZ!f)#rZ{lj|
z<ml>RXk=<(U|?WoVPxUtY;0s{=wxEy;%4OLYNudBP)RJ8ogG(kNn%k+MNw)RmywZ?
NsWF$Ts;j>n7XXe_CrbbT

delta 152
zcmeycoAJYL#t9Qy%}p&#O*T%u#lvoHWolt%YO=YUcP1l@Gg+M9494CZ!f)#r@8;xe
z>||`|XlQ0=VdUsyXzt|dXzpZSY2@bW?CNM~V5eY1P)RJ8ogG(kNn%k+MNw)RmywZ?
NsWF$Ts;j>n7XZC5C*uGB

diff --git a/lucene/docs/demo.pdf b/lucene/docs/demo.pdf
index b22493113ee4e1f4b4ce0a5eebda778108d1dba5..492070a74da1c87e8b80d4ddbcae012a17a53aae 100644
GIT binary patch
delta 150
zcmaDC|1N&QDpm_aGXwLD>p%0bTUZ&ISs9pbUdcO?5yqM9$!`W@Z*Jq~RERflF>o<=
zF|}}XH8pT_HFPm{Gc$2@G<9<}Hg+~QGjg?4upy`<mdnnLtGFbwsHCDOHI2*A(8$u1
LOI6j?-;E0ZeL^R8

delta 150
zcmaDC|1N&QDpqq-3sbX=>p%0bn_HP$Secq_UdcO?5yqM9$!`W@Z*Jq~RET#pGcz%B
zG;lU`bFpx-Ff_JsvvhWIc5*cZ8szHgW?-jaLr_U9mz^C~aY<rPNkvg=8keD=k)<h@
Ks;aBM8y5hW#V61J

diff --git a/lucene/docs/demo2.pdf b/lucene/docs/demo2.pdf
index bd157873fff31350bc0b27f885d3e185b4b7d7c3..323b01a52e691007e0436059ac7a93446ece8909 100644
GIT binary patch
delta 126
zcmaD|^}1@pVpa=7GXwLDE8g(1TUZ&ISs9pbp3OUx5yqKp&2I){Z?52<qU&tnW@v0_
o;N;}&=4j&VW@=zy>gZ<aWMpPwWaMgWX=Y-lU_(gBWPe*303Y%pS^xk5

delta 126
zcmaD|^}1@pVpelg3sbX=E8g(1n_HP$Secq_p3OUx5yqKp&2I){Z?52<qU&sKW@2gP
oY;I}p=4xbSY2;*TVQFdTY~p0>YG&@@<Z5cCU_(gBWPe*304@_DtN;K2

diff --git a/lucene/docs/fileformats.html b/lucene/docs/fileformats.html
index 72d76b58e39..0b2b610ff7a 100644
--- a/lucene/docs/fileformats.html
+++ b/lucene/docs/fileformats.html
@@ -341,7 +341,7 @@ document.write("Last Published: " + document.lastModified);
 <div class="section">
 <p>
                 This document defines the index file formats used
-                in Lucene version 4.0. If you are using a different
+                in this version of Lucene. If you are using a different
                 version of Lucene, please consult the copy of
                 <span class="codefrag">docs/fileformats.html</span>
                 that was distributed
diff --git a/lucene/docs/fileformats.pdf b/lucene/docs/fileformats.pdf
index 95ae0f8c7730aeac3dd77892cfa5c437dab0f7b7..98b1746c4f34865586bb77841d643feb8337c319 100644
GIT binary patch
delta 2114
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

delta 2114
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

diff --git a/lucene/docs/gettingstarted.pdf b/lucene/docs/gettingstarted.pdf
index cd1bcceefd11c45d761830f2b92b3b6da7606406..632b6635763b4b18296708b18dbe31025b008282 100644
GIT binary patch
delta 148
zcmbQ_G|6egOjZj+GXt}Y^B(cATUZ&ISs9pZZs(oJ2;)pv=Qo3~H>dCi3dUNxI5`=c
znV6XvyIMH87`qvoSh!f2IGGq38kjm+TG}btSQ1ha%VlTBRa}x-R8motn#N^rZfeA(
Ks_N?R#svUaYb8Pe

delta 148
zcmbQ_G|6egOjdJK3saMg^B(cAn_HP$Secq^Zs(oJ2;)pv=Qo3~H>dCi3dR~+7#TR5
z8yXr~I+>Xo8kss<m|2=T8@QP}Te`Ve8rvz@SQ1ha%VlTBRa}x-R8motn#N^rZfeA(
Ks_N?R#svUTcqJ?V

diff --git a/lucene/docs/index.html b/lucene/docs/index.html
index f1e9b244fed..444acc58bf5 100644
--- a/lucene/docs/index.html
+++ b/lucene/docs/index.html
@@ -226,7 +226,7 @@ document.write("Last Published: " + document.lastModified);
 <h1>Lucene Java Documentation</h1>
     
 <p>
-    This is the official documentation for Lucene Java 4.0<BR>
+    This is the official documentation for Lucene Java<BR>
 	Please use the menu on the left to access the Javadocs and different documents.
     </p>
 	
diff --git a/lucene/docs/index.pdf b/lucene/docs/index.pdf
index b7228066485e8b66ab3786e5ec9685fa8422617e..29e160ba50d4dd99e47c2030e79c7603d87d6c98 100644
GIT binary patch
delta 552
zcmeCz>(`sm%W7e0W?;T?(ls7-3oAo2D+BY*`Mfh3VVueQ{AO^r5C6*g;wA%;*6)A1
zc5mr+6KXne$?lEM@@^}m$BW)7wYnI)W>miTa{oJ<(3)?CJq1O3?-cJ_EmE^bPxIcQ
z7RPO$?QCvc*HE!LlVo?rCzajC<a|<vkk}%bqhi<MI%~`CUFHt^ys*w7U#RQUzPqoP
z!tQ;VEiA=r7QWIv)}TW%be?~bSpCNdhmL(qJf)%(c%;U@L9)}by@cI=^6OWBH(#5b
zTg@nZ;Jh*S%BeT3HXGgbTK(+3k~IHnudVEXyB{xlbt-1dF0IbjdR(ik`j5$`D8Jr&
zX5(AdOV#hqTo*m%6n)qKYa`?9jZ6u53NAiAWvQOnAo-Hv(}mPcC7$n&#zj;Hr{49O
zR-Zfn^e<m=#egz1{<j`eT0DjLnJ=#`t8~BE_hM?0)#XDEpDx#{^$pz`TAy02vm_&C
zuk_W6tnOv!HvIXRt2p)d&0D9qCZ=x6)OlWRB_@#dVp8Kfi=$5t{@@FovNQRT*GZ{`
z=Om;*ov!fn%s9q=_($cu?9E;E;wI}vg<m-B5!0K*_wVGcYx%#Py#K^{<o2aAn;QfT
zS>r6-%q?BbT%8=9Ei8;&9L=39%z$hca|2gXHy1Z^Cp!fjf=Xh!?CiLTOA?DpDvDCm
QxJ*q9EV)!wUH#p-0P3jnnE(I)

delta 552
zcmeCz>(`sm%W7_FVQRK<(ls7-b1PE|D^s)0`Mfh3VVueQ{AO^r5C6*g;AR7n*6)A1
zcCX<M7IJD#t-Ug{kJ~zRS@$a?rwKhGTK#2zzTb0jS{vHV=%+V*&ga+#4;~fzeiU-y
znKbwF!wdV|6pIqYJ}q3PZT(>1KJmkI4dkC{6y2~;{bp-%TYSwj=f5lNtB6dk+<l#O
z&D^Wz>LyY-c}eNJ5(J#)Sn6>`9;mP7%3sDG?8eB+^lX>h8IKc|N33u7<*ojkzV_ay
zZ(M2(&y7E?oOr{^*y!BSz|VU<jvd`~>ek{FZ;Jv;Q?;T(ryeO2Zw=h*o-Dp;;#bFI
zH@-1_ytK1_Vn(T3>*vLJD-Kra@Jn2e`C?LZuJe7On^l8NS*K3!q@@-d%I{Y#xqWie
z+xlY3{Vxx(pQ?M)UZ&FVM}w=K_i@b4J&QBkzi6EfS=4gW`+V%LsIaSUf2Z~eUth7@
zsq0u-$zrRY51-B5s;56s%xJUxhP6CT%1xdLuDZC0(O0E2M{j0{5z9t?mzhykQ&Ts&
z?UCQY`}1gb@S|+~{13C1ue{{^vpnQ+gJGlAk?cfezLnnBdaJ_I?azr{ExwYlxk1p7
zHO|D<(9Oca(aFfg%+1Wr+11F+(#_1&(9qb@+|=2{&Dl=DhM<yIE;~D};*!Lol8U0#
RG%iyU14}MdRabvEE&#3n?e72p

diff --git a/lucene/docs/linkmap.pdf b/lucene/docs/linkmap.pdf
index 7d181ece2b74f2353fe53199073c8935cd262ee7..aa1a51d014b84beaedb5d2231697a303ecf45ffd 100644
GIT binary patch
delta 126
zcmZoEYAKp9iPgf;%)or(^xHh_7FLF4RtDyqD|u%!!Z?#9`ORSL&0+lhn$AW}7EZ>-
oMrNii&Tfw8Zf+*##x52v#s-c?ZZ2jfMh12YHiVQ+eqkX40BnmOWB>pF

delta 126
zcmZoEYAKp9iPhZH!qjx*^xHh_=2oT_R;H$#D|u%!!Z?#9`ORSL&0+lhn$8xMW^PW#
oW=1ZqE(V4MmgXjwj)soLPL6KIjuw_Krsj4EHiVQ+eqkX40Cj*MegFUf

diff --git a/lucene/docs/lucene-contrib/index.pdf b/lucene/docs/lucene-contrib/index.pdf
index 6a8527bfc5b9621113ef2f5f4d3397e64645f145..117d9991219a234349be1c4dcd496653c6ffda4c 100644
GIT binary patch
delta 128
zcmZo&#@M=yal#~43qvylvyIbl^RQc38Jbxcm~F1)oyiE}OqS#~gRwV<@dr3No4Gg|
qIaxS4xth3{IvO}SJ31Ozm>8J5n46dzSz0)m+bP%(QZo5vkPHB_T_GR<

delta 128
zcmZo&#@M=yal#~4b5jdb(~Z+_^RSy+nOazxnr^P-oyiE}OqS#~gRwV<@dr3N8<?9}
qnm8Lfnz)!anwz@0SQwa?8M~M{n;9AzSh$!N*eTc$QZo5vkPHB(cOa|)

diff --git a/lucene/docs/queryparsersyntax.pdf b/lucene/docs/queryparsersyntax.pdf
index 11d2b922f09f43912d4fbc04b27924d972f317e2..fe633978045ceeec49e770be17f2a5d0d95d7c13 100644
GIT binary patch
delta 128
zcmdn>nQ_-=#tG9|Eey>J%s0+?z{74~WoTw)V7|GTcP1l@Gg+D6494D^!2dhb+04?w
q%*@Hr#n9No)xyNh)zQSl&C=M>+}X{^&BemW)K0;Mkdn#sDrEqI!y{Gz

delta 128
zcmdn>nQ_-=#tG9|%}p&#O*hVYz{75CWolt%YPz|ZcP1l@Gg+D6494D^!2dhb*~QS!
q+|kI<(b>Yt#L3*!*~HP%(8Sfr*}}lY(%H$t!cM`4kdn#sDrEqOjw2KR

diff --git a/lucene/docs/scoring.pdf b/lucene/docs/scoring.pdf
index 1c519d574e8b629e64e39bce78257fb298f60bfa..a3d5af011a7ed6f5978d4fe8c872d79ffb2df624 100644
GIT binary patch
delta 152
zcmZ3qpK;NC#tGf57KUa9<{Kwm;bFJ1GBmR?FyEZbJChN{nas^^24ipb;Q#F(?`mmi
zZ06|ZX6$5aVPRlkVCZ7(Vr*b(U~Ft+W@2h;WT#+5P)RJ8ogG(kNn%k+MNw)RmywaB
NkvW&Ds;j>n7XV4XCZqrW

delta 152
zcmZ3qpK;NC#tGf5=B5^=rW+?*;bAwoGPSTWHQk)eJChN{nas^^24ipb;Q#F(Z|dS`
zZ02U^Z0Kt0>|$u@WMt-K?C5A_X>4X_WMOXNXs2L9P)RJ8ogG(kNn%k+MNw)RmywaB
NkvW&Ds;j>n7XX3ECv*S+

diff --git a/lucene/docs/systemrequirements.html b/lucene/docs/systemrequirements.html
index d3fae2f7e4c..71a9f6fd610 100644
--- a/lucene/docs/systemrequirements.html
+++ b/lucene/docs/systemrequirements.html
@@ -237,7 +237,7 @@ document.write("Last Published: " + document.lastModified);
 <h2 class="boxed">System Requirements</h2>
 <div class="section">
 <p>
-    Lucene Java 4.0 has the following minimum requirements:
+    Lucene Java has the following minimum requirements:
     <ul>
         
 <li>Java 1.5.x or greater.</li>
diff --git a/lucene/docs/systemrequirements.pdf b/lucene/docs/systemrequirements.pdf
index ecb9b405835d5a184ebefb7d31ad340ac8c14805..f894eca113df9e32fbe247a0f2972421a96b2807 100644
GIT binary patch
delta 776
zcmX@_aN1$QbXE&PGXwLDa~|-pTUZ&ISs9pbZswiI2;)pv<~M_}Hz)AxGsWFW@tbhV
zJ8H$I5No~bWx6|_EE0^{v2b61yK}QcOM+8!OTqkdM~{*hDNn3FNQtKSDg4RZcu8!H
z>FKOx4-0o$G|h0Ea;biq^@m-*48PwL>bN&wccH;A`<=||Z@Zton=$#LpriKT)G)*C
z-m=01GfNUb^**v({il2C=ZBwM4nA|(=G;4Bul0@_(_%Rf@9=Z0og6D9&*cAVa-ER8
z<k{^hM)x~>_FL@S_V1J2+$Ub0j)$ExFWzmRyiG{g^<8bINaU__t3!kPo+Z4m-1~D&
zTEmv-hCcUOw~PMU8-D%G!*eg9ti@7Zyxa6}>0#FQS(b|?JUH2?`DdwNP}QgDpTzgH
zGKNmp5Pr{SuvtQ63a6-%f&mC9<SB5083tyS7Uq)=$_g_YPrfRftZ9fYZ*F8^hAw7e
zX=pJyQBJKMQ_9rPz#Lt<siBbtx|q4K35J-dA*Ps_ftd-qUQ;6rh&Lv)$@AHoqDz~b
z7-6{B+|<ArU7eYcrRn5AdEr0|6U<D^EiqJ^VtUrh%o0<tg@O6xt@1W;CazA7F6PFD
zrp`dx&BWZ?(A>qu&D6xi$ko}{*u>mU!G@rcSS~v|uHur!qLPZD)HE)0Q&VFuRaIAi
GH!c9+qW0tf

delta 799
zcmX@@aNc3UbXIdy3sbX=a~|-pn_HP$Secq_ZswiI2;)pv<~M_}Hz)AxGbQmTZpxT!
znVF@ZxA0WZ+Z{2tw?3HE?N-6r?qx66$Im3##Mvu&sFs!6X_2$K@{`8vD@=;T9_DvX
z-IlO6GR&B_|MF46BPNTc{4>7Wc>QYs&hyhMH1AE+U1;#jekb$#+wLdtPMG{w(2?=P
zWPKq?!HjK>dnfF5-Em`DEa%}Jer<J=BZcId&cB&lB_uB?yCcQueuvL~i=Es4Ny*QB
z;??PR*eUbk-JZ#tgmhj1F)j&Ad1<vi%-3>O^WNuQpIx5Ccxm2ogIe)>VL!gd#cpo5
zUYz|lV#31Rr`x9UiSJqcw8N=MoqgGd>Bl@?o}7O=-no_O<zyA%_lzc+MMS1>YMLn+
zfPg}t0vDKJU}kA)h%RPsXk<S5qHMCJDTa)Zr2)E_iKUUz<XAbidQ2%(LqiP1O%08W
z(2X!RHpLJ#HN+G%GcdD2*K2BI0r6BlvagKHEzuR4n;2ub-Q3i`99^B6ktK#+Gh+)(
zF%t`8biD><rkJ5%1`K0#g=Q9phLbnS+r$}|TAI088oIfen>)I?Ihq(*x>;CSIvJP(
pO?NbKak5jeA*dvl%g&CgxFoTtq@pM_jmzBB)SOFI)z#mP3jhxk>@WZT

diff --git a/lucene/src/site/src/documentation/content/xdocs/fileformats.xml b/lucene/src/site/src/documentation/content/xdocs/fileformats.xml
index 228e18a2b62..5980e0383b2 100644
--- a/lucene/src/site/src/documentation/content/xdocs/fileformats.xml
+++ b/lucene/src/site/src/documentation/content/xdocs/fileformats.xml
@@ -12,7 +12,7 @@
 
             <p>
                 This document defines the index file formats used
-                in Lucene version 4.0. If you are using a different
+                in this version of Lucene. If you are using a different
                 version of Lucene, please consult the copy of
                 <code>docs/fileformats.html</code>
                 that was distributed
diff --git a/lucene/src/site/src/documentation/content/xdocs/index.xml b/lucene/src/site/src/documentation/content/xdocs/index.xml
index b9035127d8c..556650fde40 100644
--- a/lucene/src/site/src/documentation/content/xdocs/index.xml
+++ b/lucene/src/site/src/documentation/content/xdocs/index.xml
@@ -6,7 +6,7 @@
   
   <body>
     <p>
-    This is the official documentation for Lucene Java 4.0<BR/>
+    This is the official documentation for Lucene Java<BR/>
 	Please use the menu on the left to access the Javadocs and different documents.
     </p>
 	<p>
diff --git a/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml b/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml
index 82c309c7460..f27fdaad475 100644
--- a/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml
+++ b/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml
@@ -11,7 +11,7 @@
    </section> -->
 <section id="System Requirements"><title>System Requirements</title>
 <p>
-    Lucene Java 4.0 has the following minimum requirements:
+    Lucene Java has the following minimum requirements:
     <ul>
         <li>Java 1.5.x or greater.</li>
         <li>ANT 1.7.0 or greater.</li>

From 6314bd4be9c384f9649e36bdb2bdfd391365517f Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Mon, 30 May 2011 22:36:44 +0000
Subject: [PATCH 03/20] SOLR-2558: remove apache lucene version from solr
 changes.txt

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129413 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 19f717bebf7..029ba55da99 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -24,7 +24,6 @@ $Id$
 ==================  4.0.0-dev ==================
 Versions of Major Components
 ---------------------
-Apache Lucene trunk
 Apache Tika 0.8
 Carrot2 3.5.0
 Velocity 1.6.4 and Velocity Tools 2.0

From 67317f70845ffc8a837869ca7f55723f50c08f2e Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Mon, 30 May 2011 22:53:19 +0000
Subject: [PATCH 04/20] SOLR-2559: all solr contrib CHANGES.txt have 3.2-dev as
 the release header

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129424 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/contrib/analysis-extras/CHANGES.txt   | 10 +++++++---
 solr/contrib/clustering/CHANGES.txt        | 10 +++++++---
 solr/contrib/dataimporthandler/CHANGES.txt | 10 +++++++---
 solr/contrib/extraction/CHANGES.txt        | 10 +++++++---
 solr/contrib/uima/CHANGES.txt              | 10 +++++++++-
 5 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/solr/contrib/analysis-extras/CHANGES.txt b/solr/contrib/analysis-extras/CHANGES.txt
index 72053f89d8b..30584cc64d8 100644
--- a/solr/contrib/analysis-extras/CHANGES.txt
+++ b/solr/contrib/analysis-extras/CHANGES.txt
@@ -11,17 +11,21 @@ analyzers for Chinese and Polish.
 
 
 $Id$
-================== Release 4.0-dev ==================
+==================  4.0.0-dev ==============
 
 * SOLR-2396: Add ICUCollationField, which is much more efficient than
   the Solr 3.x ICUCollationKeyFilterFactory, and also supports
   Locale-sensitive range queries.  (rmuir)
 
-================== Release 3.2-dev ==================
+==================  3.3.0-dev ==============
 
 (No Changes)
 
-================== Release 3.1-dev ==================
+==================  3.2.0 ==================
+
+(No Changes)
+
+==================  3.1.0 ==================
 
 * SOLR-2210: Add icu-based tokenizer and filters to contrib/analysis-extras (rmuir)
 
diff --git a/solr/contrib/clustering/CHANGES.txt b/solr/contrib/clustering/CHANGES.txt
index 2fc90d67410..fd7e92cb612 100644
--- a/solr/contrib/clustering/CHANGES.txt
+++ b/solr/contrib/clustering/CHANGES.txt
@@ -7,7 +7,7 @@ See http://wiki.apache.org/solr/ClusteringComponent
 CHANGES
 
 $Id$
-================== Release 4.0.0-dev ==================
+================== Release 4.0.0-dev ==============
 
 * SOLR-2448: Search results clustering updates: bisecting k-means
   clustering algorithm added, loading of Carrot2 stop words from
@@ -15,7 +15,11 @@ $Id$
   for clustering (SOLR-2450), output of cluster scores (SOLR-2505)
   (Stanislaw Osinski, Dawid Weiss).
 
-================== Release 3.2.0-dev ==================
+================== Release 3.3.0-dev ==============
+
+(No Changes)
+
+================== Release 3.2.0 ==================
 
 * SOLR-2448: Search results clustering updates: bisecting k-means
   clustering algorithm added, loading of Carrot2 stop words from
@@ -23,7 +27,7 @@ $Id$
   for clustering (SOLR-2450), output of cluster scores (SOLR-2505)
   (Stanislaw Osinski, Dawid Weiss).
 
-================== Release 3.1.0-dev ==================
+================== Release 3.1.0 ==================
 
 * SOLR-1684: Switch to use the SolrIndexSearcher.doc(int, Set<String>) method b/c it can use the document cache (gsingers)
 
diff --git a/solr/contrib/dataimporthandler/CHANGES.txt b/solr/contrib/dataimporthandler/CHANGES.txt
index 73195c2f711..7cb1bc06df0 100644
--- a/solr/contrib/dataimporthandler/CHANGES.txt
+++ b/solr/contrib/dataimporthandler/CHANGES.txt
@@ -8,15 +8,19 @@ HTTP data sources quick and easy.
 
 
 $Id$
-==================  4.0.0-dev ==================
+==================  4.0.0-dev ==============
 
 (No Changes)
 
-==================  3.2.0-dev ==================
+==================  3.3.0-dev ==============
 
 (No Changes)
 
-==================  3.1.0-dev ==================
+==================  3.2.0 ==================
+
+(No Changes)
+
+==================  3.1.0 ==================
 Upgrading from Solr 1.4
 ----------------------
 
diff --git a/solr/contrib/extraction/CHANGES.txt b/solr/contrib/extraction/CHANGES.txt
index 26f35270ac8..ffaad377a63 100644
--- a/solr/contrib/extraction/CHANGES.txt
+++ b/solr/contrib/extraction/CHANGES.txt
@@ -24,16 +24,20 @@ Current Version: Tika 0.8 (released 11/07/2010)
 
 $Id$
 
-================== Release 4.0-dev ==================
+================== Release 4.0.0-dev ==============
 
 (No Changes)
 
-================== Release 3.2-dev ==================
+================== Release 3.3.0-dev ==============
+
+(No Changes)
+
+================== Release 3.2.0 ==================
 
 * SOLR-2480: Add ignoreTikaException flag so that users can ignore TikaException but index
   meta data. (Shinichiro Abe, koji)
 
-================== Release 3.1-dev ==================
+================== Release 3.1.0 ==================
 
 * SOLR-1902: Upgraded to Tika 0.8 and changed deprecated parse call
 
diff --git a/solr/contrib/uima/CHANGES.txt b/solr/contrib/uima/CHANGES.txt
index b25798c290c..72b497236ee 100644
--- a/solr/contrib/uima/CHANGES.txt
+++ b/solr/contrib/uima/CHANGES.txt
@@ -19,7 +19,15 @@ WhitespaceTokenizer v2.3.1-SNAPSHOT rev. 1076132
 
 $Id$
 
-==================  3.2.0-dev ==================
+==================  4.0.0-dev ==============
+
+(No Changes)
+
+==================  3.3.0-dev ==============
+
+(No Changes)
+
+==================  3.2.0 ==================
 
 Upgrading from Solr 3.1
 ----------------------

From 42a2a5df7e7ed9f43906ec8285fdfd0bfd62ce89 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Mon, 30 May 2011 23:11:10 +0000
Subject: [PATCH 05/20] LUCENE-3163: remove release dates from CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129427 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/CHANGES.txt                         | 40 +++++++++++-----------
 lucene/contrib/CHANGES.txt                 | 14 ++++----
 solr/CHANGES.txt                           |  6 ++--
 solr/contrib/dataimporthandler/CHANGES.txt |  2 +-
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 1c63484c450..f4cec4ea23e 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -1315,7 +1315,7 @@ Documentation
 * LUCENE-2894: Use google-code-prettify for syntax highlighting in javadoc.
   (Shinichiro Abe, Koji Sekiguchi)
   
-================== Release 2.9.4 / 3.0.3 2010-12-03 ====================
+================== Release 2.9.4 / 3.0.3 ====================
 
 Changes in runtime behavior
 
@@ -1468,7 +1468,7 @@ Documentation
   Java NIO behavior when a Thread is interrupted while blocking on IO.
   (Simon Willnauer, Robert Muir)
 
-================== Release 2.9.3 / 3.0.2 2010-06-18 ====================
+================== Release 2.9.3 / 3.0.2 ====================
 
 Changes in backwards compatibility policy
 
@@ -1613,7 +1613,7 @@ Build
   compiling/testing/packaging. This marks the benchmark contrib also
   as Java 1.5, as it depends on fast-vector-highlighter. (Uwe Schindler)
 
-================== Release 2.9.2 / 3.0.1 2010-02-26 ====================
+================== Release 2.9.2 / 3.0.1 ====================
 
 Changes in backwards compatibility policy
 
@@ -1716,7 +1716,7 @@ Documentation
    provided reader is per-segment (Simon Willnauer via Mike
    McCandless)
  
-======================= Release 3.0.0 2009-11-25 =======================
+======================= Release 3.0.0 =======================
 
 Changes in backwards compatibility policy
 
@@ -1917,7 +1917,7 @@ Build
 * LUCENE-2024: Raise build requirements to Java 1.5 and ANT 1.7.0
   (Uwe Schindler, Mike McCandless)
 
-======================= Release 2.9.1 2009-11-06 =======================
+======================= Release 2.9.1 =======================
 
 Changes in backwards compatibility policy
 
@@ -1987,7 +1987,7 @@ Documentation
  * LUCENE-2008: Javadoc improvements for TokenStream/Tokenizer/Token
    (Luke Nezda via Mike McCandless)
 
-======================= Release 2.9.0 2009-09-23 =======================
+======================= Release 2.9.0 =======================
 
 Changes in backwards compatibility policy
 
@@ -2901,7 +2901,7 @@ Test Cases
  * LUCENE-1836: Added a new LocalizedTestCase as base class for localization
     junit tests.  (Robert Muir, Uwe Schindler via Michael Busch)
 
-======================= Release 2.4.1 2009-03-09 =======================
+======================= Release 2.4.1 =======================
 
 API Changes
 
@@ -2969,7 +2969,7 @@ Bug fixes
     rollback IndexWriter's internal state on hitting an
     exception. (Scott Garland via Mike McCandless)
 
-======================= Release 2.4.0 2008-10-06 =======================
+======================= Release 2.4.0 =======================
 
 Changes in backwards compatibility policy
 
@@ -3334,7 +3334,7 @@ Test Cases
  2. LUCENE-1348: relax TestTimeLimitedCollector to not fail due to 
     timeout exceeded (just because test machine is very busy).
 	
-======================= Release 2.3.2 2008-05-05 =======================
+======================= Release 2.3.2 =======================
 
 Bug fixes
 
@@ -3384,7 +3384,7 @@ Build
  1. LUCENE-1230: Include *pom.xml* in source release files. (Michael Busch)
 
  
-======================= Release 2.3.1 2008-02-22 =======================
+======================= Release 2.3.1 =======================
 
 Bug fixes
     
@@ -3413,7 +3413,7 @@ Bug fixes
     preventing Fields with empty-string field name from working.
     (Sergey Kabashnyuk via Mike McCandless)
 
-======================= Release 2.3.0 2008-01-21 =======================
+======================= Release 2.3.0 =======================
 
 Changes in runtime behavior
 
@@ -3805,7 +3805,7 @@ Test Cases
  1. LUCENE-766: Test adding two fields with the same name but different 
     term vector setting.  (Nicolas Lalevée via Doron Cohen)  
     
-======================= Release 2.2.0 2007-06-19 =======================
+======================= Release 2.2.0 =======================
 
 Changes in runtime behavior
 
@@ -4114,7 +4114,7 @@ Build
     of the Lucene core and the contrib modules. 
     (Sami Siren, Karl Wettin, Michael Busch)
 
-======================= Release 2.1.0 2007-02-14 =======================
+======================= Release 2.1.0 =======================
 
 Changes in runtime behavior
 
@@ -4602,7 +4602,7 @@ Build
      distribution of both binary and source distributions.  Called by package 
      and package-*-src
 
-======================= Release 2.0.0 2006-05-26 =======================
+======================= Release 2.0.0 =======================
 
 API Changes
 
@@ -5706,7 +5706,7 @@ Infrastructure
 11. Fixed bugs in GermanAnalyzer (gschwarz)
 
 
-1.2 RC2, 19 October 2001:
+1.2 RC2:
  - added sources to distribution
  - removed broken build scripts and libraries from distribution
  - SegmentsReader: fixed potential race condition
@@ -5721,7 +5721,7 @@ Infrastructure
  - JDK 1.1 compatibility fix: disabled lock files for JDK 1.1,
    since they rely on a feature added in JDK 1.2.
 
-1.2 RC1 (first Apache release), 2 October 2001:
+1.2 RC1 (first Apache release):
   - packages renamed from com.lucene to org.apache.lucene
   - license switched from LGPL to Apache
   - ant-only build -- no more makefiles
@@ -5732,18 +5732,18 @@ Infrastructure
   - Analyzers can choose tokenizer based on field name
   - misc bug fixes.
 
-1.01b (last Sourceforge release), 2 July 2001
+1.01b (last Sourceforge release)
  . a few bug fixes
  . new Query Parser
  . new prefix query (search for "foo*" matches "food")
 
-1.0, 2000-10-04
+1.0
 
 This release fixes a few serious bugs and also includes some
 performance optimizations, a stemmer, and a few other minor
 enhancements.
 
-0.04 2000-04-19
+0.04
 
 Lucene now includes a grammar-based tokenizer, StandardTokenizer.
 
@@ -5768,7 +5768,7 @@ StandardTokenizer serves two purposes:
     the new tokenizer into the application and modifying it
     accordingly.
 
-0.01, 2000-03-30
+0.01
 
 First open source release.
 
diff --git a/lucene/contrib/CHANGES.txt b/lucene/contrib/CHANGES.txt
index 5bfb377975d..58cd38e5788 100644
--- a/lucene/contrib/CHANGES.txt
+++ b/lucene/contrib/CHANGES.txt
@@ -442,7 +442,7 @@ Other
  * LUCENE-2415: Use reflection instead of a shim class to access Jakarta
    Regex prefix.  (Uwe Schindler)
 
-================== Release 2.9.4 / 3.0.3 2010-12-03 ====================
+================== Release 2.9.4 / 3.0.3 ====================
 
 Bug Fixes
 
@@ -477,11 +477,11 @@ Documentation
    as expected on all JRE's. For example, on an IBM JRE, it does nothing.
    (Robert Muir)
 
-================== Release 2.9.3 / 3.0.2 2010-06-18 ====================
+================== Release 2.9.3 / 3.0.2 ====================
 
 No changes.
 
-================== Release 2.9.2 / 3.0.1 2010-02-26 ====================
+================== Release 2.9.2 / 3.0.1 ====================
 
 New features
 
@@ -520,7 +520,7 @@ API Changes
  * LUCENE-2165: Add a constructor to SnowballAnalyzer that takes a Set of 
    stopwords, and deprecate the String[] one.  (Nick Burch via Robert Muir)
    
-======================= Release 3.0.0 2009-11-25 =======================
+======================= Release 3.0.0 =======================
 
 Changes in backwards compatibility policy
 
@@ -597,7 +597,7 @@ Build
  * LUCENE-2031: Moved PatternAnalyzer from contrib/memory into
    contrib/analyzers/common, under miscellaneous.  (Robert Muir)
    
-======================= Release 2.9.1 2009-11-06 =======================
+======================= Release 2.9.1 =======================
 
 Changes in backwards compatibility policy
 
@@ -640,7 +640,7 @@ Bug fixes
  * LUCENE-2013: SpanRegexQuery does not work with QueryScorer.
    (Benjamin Keil via Mark Miller)
 
-======================= Release 2.9.0 2009-09-23 =======================
+======================= Release 2.9.0 =======================
 
 Changes in runtime behavior
 
@@ -829,7 +829,7 @@ Build
 Test Cases
 
 
-======================= Release 2.4.0 2008-10-06 =======================
+======================= Release 2.4.0 =======================
 
 Changes in runtime behavior
 
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 029ba55da99..3f39f1a2753 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -1829,7 +1829,7 @@ Documentation
 
  3. SOLR-1409: Added Solr Powered By Logos    
 
-================== Release 1.3.0 20080915 ==================
+================== Release 1.3.0 ==================
 
 Upgrading from Solr 1.2
 -----------------------
@@ -2490,7 +2490,7 @@ Build
               client and contrib. The target can publish artifacts with source and javadocs.
               (Spencer Crissman, Craig McClanahan, shalin)
 
-================== Release 1.2, 20070602 ==================
+================== Release 1.2 ==================
 
 Upgrading from Solr 1.1
 -------------------------------------
@@ -2839,7 +2839,7 @@ Other Changes
 
  2. Updated to Lucene 2007-05-20_00-04-53
 
-================== Release 1.1.0, 20061222 ==================
+================== Release 1.1.0 ==================
 
 Status
 ------
diff --git a/solr/contrib/dataimporthandler/CHANGES.txt b/solr/contrib/dataimporthandler/CHANGES.txt
index 7cb1bc06df0..663beb23ec9 100644
--- a/solr/contrib/dataimporthandler/CHANGES.txt
+++ b/solr/contrib/dataimporthandler/CHANGES.txt
@@ -444,7 +444,7 @@ Other
 11.SOLR-1269: Better error messages from JdbcDataSource when JDBC Driver name or SQL is incorrect.
               (ehatcher, shalin)
 
-================== Release 1.3.0 20080915 ==================
+================== Release 1.3.0 ==================
 
 Status
 ------

From c8101d708c59eff31ab054ea928472209dd80bca Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 31 May 2011 00:08:14 +0000
Subject: [PATCH 06/20] LUCENE-3160: lucene source build doesn't work correctly
 by itself

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129445 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                         |  1 -
 common-build.xml                  | 32 -------------------------------
 lucene/common-build.xml           |  6 +++++-
 modules/analysis/build.xml        |  7 +++++++
 modules/analysis/common/build.xml |  2 +-
 modules/analysis/icu/build.xml    |  2 +-
 modules/build.xml                 | 30 ++++++++++-------------------
 solr/common-build.xml             | 13 ++++++++++++-
 8 files changed, 36 insertions(+), 57 deletions(-)
 delete mode 100644 common-build.xml

diff --git a/build.xml b/build.xml
index bafb558aad6..0b31ff8ba2e 100644
--- a/build.xml
+++ b/build.xml
@@ -18,7 +18,6 @@
  -->
 
 <project name="lucene-solr" default="test" basedir=".">
-  <import file="common-build.xml"/>
   <target name="test" description="Test both Lucene and Solr" depends="validate">
     <sequential>
       <subant target="test" inheritall="false" failonerror="true">
diff --git a/common-build.xml b/common-build.xml
deleted file mode 100644
index 8b61899acbd..00000000000
--- a/common-build.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<project name="all-common" basedir="."
-         xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <dirname file="${ant.file.all-common}" property="all.common.dir"/>
-  <path id="tools.runtime.classpath">
-    <pathelement location="${all.common.dir}/lucene/build/classes/tools"/>
-  </path>
-  <target name="compile-tools" description="Compile the Test Framework and Validation tools">
-    <sequential>
-      <subant target="compile-tools" inheritall="false" failonerror="true">
-        <fileset dir="${all.common.dir}/lucene" includes="build.xml" />
-      </subant>
-    </sequential>
-  </target>
-</project>
\ No newline at end of file
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 1ce62bbb7c8..c2dace95c2c 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -24,7 +24,6 @@
   </description>
 
   <dirname file="${ant.file.common}" property="common.dir"/>
-  <import file="${common.dir}/../common-build.xml"/>
   <property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
   <property name="prettify.dir" value="${common.dir}/src/tools/prettify"/>
   <property name="maven.build.dir" value="${common.dir}/build/maven"/>
@@ -61,6 +60,11 @@
     <fileset dir="${common.dir}/lib" includes="ant-*.jar"/>
   </path>
 
+  <path id="tools.runtime.classpath">
+    <pathelement location="${common.dir}/build/classes/tools"/>
+  </path>
+
+
   <!-- default arguments to pass to JVM executing tests -->
   <property name="testmethod" value=""/>
   <property name="args" value=""/>
diff --git a/modules/analysis/build.xml b/modules/analysis/build.xml
index 19a3c58d17f..4c299f0f7e1 100644
--- a/modules/analysis/build.xml
+++ b/modules/analysis/build.xml
@@ -57,6 +57,13 @@
     <ant dir="smartcn" target="clean" />
     <ant dir="stempel" target="clean" />
   </target>
+  <target name="validate">
+    <ant dir="common" target="validate" />
+    <ant dir="icu" target="validate" />
+    <ant dir="phonetic" target="validate" />
+    <ant dir="smartcn" target="validate" />
+    <ant dir="stempel" target="validate" />
+  </target>
   <target name="compile-core">
     <ant dir="common" target="compile-core" />
     <ant dir="icu" target="compile-core" />
diff --git a/modules/analysis/common/build.xml b/modules/analysis/common/build.xml
index 75e93b58c57..b9c146633aa 100644
--- a/modules/analysis/common/build.xml
+++ b/modules/analysis/common/build.xml
@@ -106,7 +106,7 @@
     </java>
   </target>
 
-  <target name="compile-tools">
+  <target name="compile-tools" depends="common.compile-tools">
     <compile
       srcdir="src/tools/java"
       destdir="${build.dir}/classes/tools">
diff --git a/modules/analysis/icu/build.xml b/modules/analysis/icu/build.xml
index 91823d75195..fd1ea75914e 100644
--- a/modules/analysis/icu/build.xml
+++ b/modules/analysis/icu/build.xml
@@ -125,7 +125,7 @@ are part of the ICU4C package. See http://site.icu-project.org/ </echo>
     </java>
   </target>
 			
-  <target name="compile-tools">
+  <target name="compile-tools" depends="common.compile-tools">
     <compile
       srcdir="src/tools/java"
       destdir="${build.dir}/classes/tools">
diff --git a/modules/build.xml b/modules/build.xml
index 865008bd9ad..c57d55c9a0e 100644
--- a/modules/build.xml
+++ b/modules/build.xml
@@ -18,7 +18,6 @@
  -->
 
 <project name="modules" default="test" basedir=".">
-  <import file="../common-build.xml"/>
   <target name="test" description="Test all modules">
     <sequential>
       <subant target="test" inheritall="false" failonerror="true">
@@ -30,7 +29,7 @@
     </sequential>
   </target>
 
-  <target name="compile" description="Compile all modules" depends="validate-modules">
+  <target name="compile" description="Compile all modules" depends="validate">
     <sequential>
       <subant target="compile" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
@@ -74,24 +73,15 @@
       </subant>
     </sequential>
   </target>
-  <target name="validate" depends="validate-modules"/>
-  <target name="validate-modules" depends="check-legal-modules" unless="validated-modules"/>
-  <target name="check-legal-modules" depends="compile-tools">
-    <java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true">
-      <classpath>
-        <path refid="tools.runtime.classpath" />
-      </classpath>
-      <!-- TODO: it might be better to just automatically find all directories that contain jar files, but that could take a
-       long time.  This should be faster, but we could miss a directory
-       -->
-      <!-- Modules -->
-      <arg value="-c" />
-      <arg value="${basedir}/analysis/icu/lib" />
-      <arg value="-c" />
-      <arg value="${basedir}/analysis/phonetic/lib" />
-      <arg value="-c" />
-      <arg value="${basedir}/benchmark/lib" />
-    </java>
+  <target name="validate">
+     <sequential>
+      <subant target="validate" inheritall="false" failonerror="true">
+        <fileset dir="analysis" includes="build.xml" />
+        <fileset dir="benchmark" includes="build.xml" />
+        <fileset dir="grouping" includes="build.xml" />
+        <fileset dir="suggest" includes="build.xml" />
+      </subant>
+    </sequential>
   </target>
 
   <target name="clean" description="Clean all modules">
diff --git a/solr/common-build.xml b/solr/common-build.xml
index c111d7106a1..cdda84e1936 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -22,7 +22,6 @@
   </description>
 
   <dirname file="${ant.file.common-solr}" property="common-solr.dir"/>
-  <import file="${common-solr.dir}/../common-build.xml"/>
   
   <!-- change this together with the default and test's solrconfig.xml after starting a new development branch: -->
   <property name="tests.luceneMatchVersion" value="4.0"/>
@@ -636,4 +635,16 @@
     </java>
   </target>
 
+  <path id="tools.runtime.classpath">
+    <pathelement location="${common-solr.dir}/../lucene/build/classes/tools"/>
+  </path>
+  <target name="compile-tools" description="Compile the Test Framework and Validation tools">
+    <sequential>
+      <subant target="compile-tools" inheritall="false" failonerror="true">
+        <fileset dir="${common-solr.dir}/../lucene" includes="build.xml" />
+      </subant>
+    </sequential>
+  </target>
+
+
 </project>

From 7bf34183d0f152aab0c7f1cae73c5dd8a6a6f9f7 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 31 May 2011 01:22:03 +0000
Subject: [PATCH 07/20] LUCENE-3158: put licensing information in the
 LICENSE.txt file where it belongs

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129450 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/analysis/LICENSE.txt                 | 29 ++++++++++++++++++++
 modules/analysis/common/SNOWBALL-LICENSE.txt | 26 ------------------
 solr/LICENSE.txt                             | 29 ++++++++++++++++++++
 3 files changed, 58 insertions(+), 26 deletions(-)
 delete mode 100644 modules/analysis/common/SNOWBALL-LICENSE.txt

diff --git a/modules/analysis/LICENSE.txt b/modules/analysis/LICENSE.txt
index d6456956733..70721c38bfd 100644
--- a/modules/analysis/LICENSE.txt
+++ b/modules/analysis/LICENSE.txt
@@ -200,3 +200,32 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+The following license applies to the Snowball stemmers:
+
+Copyright (c) 2001, Dr Martin Porter
+Copyright (c) 2002, Richard Boulton
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+    * this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+    * notice, this list of conditions and the following disclaimer in the
+    * documentation and/or other materials provided with the distribution.
+    * Neither the name of the copyright holders nor the names of its contributors
+    * may be used to endorse or promote products derived from this software
+    * without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules/analysis/common/SNOWBALL-LICENSE.txt b/modules/analysis/common/SNOWBALL-LICENSE.txt
deleted file mode 100644
index 68c17118e78..00000000000
--- a/modules/analysis/common/SNOWBALL-LICENSE.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2001, Dr Martin Porter
-Copyright (c) 2002, Richard Boulton
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-    * this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-    * notice, this list of conditions and the following disclaimer in the
-    * documentation and/or other materials provided with the distribution.
-    * Neither the name of the copyright holders nor the names of its contributors
-    * may be used to endorse or promote products derived from this software
-    * without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/solr/LICENSE.txt b/solr/LICENSE.txt
index 0107a391126..13832f39659 100644
--- a/solr/LICENSE.txt
+++ b/solr/LICENSE.txt
@@ -1067,3 +1067,32 @@ Definitions.
 10. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
 
 NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
+
+The following license applies to the Snowball stemmers:
+
+Copyright (c) 2001, Dr Martin Porter
+Copyright (c) 2002, Richard Boulton
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+    * this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+    * notice, this list of conditions and the following disclaimer in the
+    * documentation and/or other materials provided with the distribution.
+    * Neither the name of the copyright holders nor the names of its contributors
+    * may be used to endorse or promote products derived from this software
+    * without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

From 4715d42d426033304afa2ac01d4979f37b348306 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 31 May 2011 01:36:46 +0000
Subject: [PATCH 08/20] LUCENE-3155: improve includes/excludes to explicitly
 state what is in releases (so no foo.txt or anything else is included)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129453 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/build.xml | 3 +--
 solr/build.xml   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lucene/build.xml b/lucene/build.xml
index 640b056c0bd..ef16a92e86a 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -50,8 +50,7 @@
               excludes="*-src.jar"
   />
   <patternset id="binary.root.dist.patterns"
-              includes="docs/,*.txt,contrib/**/README*,**/CHANGES.txt,contrib/**/*.sh contrib/**/docs/ contrib/xml-query-parser/*.dtd"
-              excludes="BUILD.txt"
+              includes="docs/,CHANGES.txt,LICENSE.txt,NOTICE.txt,README.txt,MIGRATE.txt,JRE_VERSION_MIGRATION.txt,contrib/**/README*,**/CHANGES.txt,contrib/**/*.sh contrib/**/docs/ contrib/xml-query-parser/*.dtd"
   />
 
 
diff --git a/solr/build.xml b/solr/build.xml
index de7ef217bee..a1f90570756 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -859,7 +859,7 @@
     <tar destfile="${package.dir}/${fullnamever}.tgz" compression="gzip" longfile="gnu">
       <tarfileset dir="."
         prefix="${fullnamever}"
-        includes="LICENSE.txt NOTICE.txt *.txt example/** client/** contrib/**/lib/ contrib/**/lucene-libs/ contrib/**/README.txt contrib/**/CHANGES.txt"
+        includes="LICENSE.txt NOTICE.txt CHANGES.txt README.txt example/** client/** contrib/**/lib/ contrib/**/lucene-libs/ contrib/**/README.txt contrib/**/CHANGES.txt"
         excludes="${dist}/** ${dest}/** lib/README.committers.txt **/data/ **/logs/* **/classes/ **/*.sh **/bin/ src/scripts/** src/site/build/** **/target/** client/ruby/flare/** client/python/** client/javascript/** contrib/**/build/** **/*.iml **/*.ipr **/*.iws **/*pom.xml.template" />
       <tarfileset dir="."
         mode="755"

From 294bd36c8ae83c09a5b78d5d99457bb2fdc3cfd9 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 31 May 2011 01:41:46 +0000
Subject: [PATCH 09/20] LUCENE-3159: lucene benchmark has some unnecessary
 files

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129456 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/benchmark/.rsync-filter | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 modules/benchmark/.rsync-filter

diff --git a/modules/benchmark/.rsync-filter b/modules/benchmark/.rsync-filter
deleted file mode 100644
index 48f861a85a2..00000000000
--- a/modules/benchmark/.rsync-filter
+++ /dev/null
@@ -1,2 +0,0 @@
-- /work
-- /temp

From 36bf2cd595dc43d12bf081e0eefdb2cf70fc7bd3 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 31 May 2011 01:53:02 +0000
Subject: [PATCH 10/20] LUCENE-3157: packaging is sometimes .tar.gz, sometimes
 .tgz

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129459 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/build.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lucene/build.xml b/lucene/build.xml
index ef16a92e86a..4fcd3a5260e 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -292,10 +292,10 @@
   <!--                                                                    -->
   <!-- ================================================================== -->
   <target name="package-tgz" depends="package"
-    description="--> Generates the lucene distribution as .tar.gz">
+    description="--> Generates the lucene distribution as .tgz">
 
     <delete file="${build.dir}/lucene-${version}.tar"/>
-    <delete file="${dist.dir}/lucene-${version}.tar.gz"/>
+    <delete file="${dist.dir}/lucene-${version}.tgz"/>
     <tar tarfile="${build.dir}/lucene-${version}.tar" longfile="gnu">
       <tarfileset prefix="lucene-${version}" dir=".">
         <patternset refid="binary.root.dist.patterns"/>
@@ -305,10 +305,10 @@
       </tarfileset>
     </tar>
 
-    <gzip zipfile="${dist.dir}/lucene-${version}.tar.gz"
+    <gzip zipfile="${dist.dir}/lucene-${version}.tgz"
       src="${build.dir}/lucene-${version}.tar"
       />
-	<lucene-checksum file="${dist.dir}/lucene-${version}.tar.gz"/>
+	<lucene-checksum file="${dist.dir}/lucene-${version}.tgz"/>
   </target>
 
   <!-- ================================================================== -->
@@ -317,7 +317,7 @@
   <!--                                                                    -->
   <!-- ================================================================== -->
   <target name="package-all-binary" depends="package-zip, package-tgz"
-    description="--> Generates the .tar.gz and .zip distributions"/>
+    description="--> Generates the .tgz and .zip distributions"/>
 
   <!-- ================================================================== -->
   <!-- same as package-all. it is just here for compatibility.            -->
@@ -344,9 +344,9 @@
   <!-- Packages the sources from "svn export" with tar-gzip               -->
   <!-- ================================================================== -->
   <target name="package-tgz-src" depends="init, init-dist, svn-export-source"
-    description="--> Generates the Lucene distribution as .tar.gz">
+    description="--> Generates the Lucene distribution as .tgz">
     <property name="source.package.file"
-              value="${dist.dir}/lucene-${version}-src.tar.gz"/>
+              value="${dist.dir}/lucene-${version}-src.tgz"/>
     <delete file="${source.package.file}"/>
     <tar tarfile="${source.package.file}" compression="gzip" longfile="gnu">
       <tarfileset prefix="lucene-${version}" dir="${svn.export.dir}"/>
@@ -493,7 +493,7 @@
       <fileset dir="${dist.dir}">
         <include name="**/*.jar"/>
         <include name="**/*.zip"/>
-        <include name="**/*.tar.gz"/>
+        <include name="**/*.tgz"/>
         <include name="**/*.pom"/>
       </fileset>
       <globmapper from="*" to="*.asc"/>

From bd14247962d75805dece260a365eaa8f2306d829 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 31 May 2011 02:11:38 +0000
Subject: [PATCH 11/20] LUCENE-3161: add workaround for java5-only JDK bug

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129465 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/src/java/org/apache/lucene/util/Version.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lucene/src/java/org/apache/lucene/util/Version.java b/lucene/src/java/org/apache/lucene/util/Version.java
index 968148e7126..204188ab9ac 100644
--- a/lucene/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/src/java/org/apache/lucene/util/Version.java
@@ -27,6 +27,9 @@ package org.apache.lucene.util;
  * change the version at search-time, but instead also adjust
  * your indexing code to match, and re-index.
  */
+// remove me when java 5 is no longer supported
+// this is a workaround for a JDK bug that wrongly emits a warning.
+@SuppressWarnings("dep-ann")
 public enum Version {
   /**
    * Match settings and bugs in Lucene's 3.0 release.

From 095423cbd693ace69f03cba79445802d4e586a5c Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 31 May 2011 02:34:56 +0000
Subject: [PATCH 12/20] LUCENE-3009: binary release doesn't include the jars
 that are depended on

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129474 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lucene/build.xml b/lucene/build.xml
index 4fcd3a5260e..45165a325f6 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -50,7 +50,7 @@
               excludes="*-src.jar"
   />
   <patternset id="binary.root.dist.patterns"
-              includes="docs/,CHANGES.txt,LICENSE.txt,NOTICE.txt,README.txt,MIGRATE.txt,JRE_VERSION_MIGRATION.txt,contrib/**/README*,**/CHANGES.txt,contrib/**/*.sh contrib/**/docs/ contrib/xml-query-parser/*.dtd"
+              includes="docs/,CHANGES.txt,LICENSE.txt,NOTICE.txt,README.txt,MIGRATE.txt,JRE_VERSION_MIGRATION.txt,contrib/**/README*,**/CHANGES.txt,contrib/**/*.sh contrib/**/docs/ contrib/xml-query-parser/*.dtd,lib/*.jar,lib/*LICENSE*.txt,lib/*NOTICE*.txt,contrib/*/lib/*.jar,contrib/*/lib/*LICENSE*.txt,contrib/*/lib/*NOTICE*.txt"
   />
 
 

From b893d89f58a3694367b2646fec7a42e7aacb7f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Osi=C5=84ski?= <stanislaw@apache.org>
Date: Tue, 31 May 2011 12:32:52 +0000
Subject: [PATCH 13/20] SOLR-2561: fixing SimpleXML notice file

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129645 13f79535-47bb-0310-9956-ffa450edef68
---
 .../clustering/lib/simple-xml-NOTICE.txt      | 56 +------------------
 1 file changed, 1 insertion(+), 55 deletions(-)

diff --git a/solr/contrib/clustering/lib/simple-xml-NOTICE.txt b/solr/contrib/clustering/lib/simple-xml-NOTICE.txt
index cb1207d3e73..6f139d6e8d6 100644
--- a/solr/contrib/clustering/lib/simple-xml-NOTICE.txt
+++ b/solr/contrib/clustering/lib/simple-xml-NOTICE.txt
@@ -1,56 +1,2 @@
-
-Mahout Collections
-Copyright 2008-2010 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
-==============================================================
- Apache Mahout
- Copyright 2009 The Apache Software Foundation
-==============================================================
-
 This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Includes software from other Apache Software Foundation projects,
-including, but not limited to:
-  - Apache Lucene Java
-  - Apache Hadoop
-  - Apache Commons
-
-This product includes software developed by the Indiana University
-  Extreme! Lab (http://www.extreme.indiana.edu/).
-  Copyright (c) 2002 Extreme! Lab, Indiana University.
-
-This product includes examples code from the Watchmaker project   
-  https://watchmaker.dev.java.net/
-  Copyright (c) 2006-2009 Daniel W. Dyer.
-
-This product includes libraries developed by the Kosmos project (http://kosmosfs.sourceforge.net/)
- Copyright 2008 Quantcast Corp.
- Copyright 2007 Kosmix Corp.
-
-This product includes software developed by the Jets3T project (https://jets3t.dev.java.net/) 
-Copyright (c) 2008 James Murty
-
-This product includes libraries developed by the CGLib project (http://cglib.sourceforge.net/)
-Copyright (c) 2008, cglib
-
-This product includes a JUnit jar: http://junit.sourceforge.net/
-License: Common Public License - v 1.0 (http://junit.sourceforge.net/cpl-v10.html)
-Copyright (c) 2000-2006, www.hamcrest.org
-
-This product includes code from the XStream project (http://xstream.codehaus.org/)
-Copyright (c) 2003-2006, Joe Walnes
-Copyright (c) 2006-2007, XStream Committers
-
-This product includes tests written with EasyMock 
-Copyright 2001-2007 Tammo Freese (http://www.easymock.org/)
-
-This product uses the Breast Cancer Wisconsin (Diagnostic) Dataset from the
-UCI Machine Learning Repository [http://www.ics.uci.edu/~mlearn/MLRepository.html, http://archive.ics.uci.edu/ml/datasets/Breast+Cancer+Wisconsin+(Diagnostic)]. 
-
-This product contains parts of the Bayesian Logic (BLOG) Inference Engine.
-Copyright (c) 2005, Regents of the University of California
+the SimpleXML project (http://simple.sourceforge.net).

From 063d18e280fc55e210670c3b69201165f43a2936 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 31 May 2011 13:03:40 +0000
Subject: [PATCH 14/20] LUCENE-3163: add link to jira versions information to
 CHANGES.txt files

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129656 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/CHANGES.txt            | 3 +++
 lucene/contrib/CHANGES.txt    | 3 +++
 modules/analysis/CHANGES.txt  | 3 +++
 modules/benchmark/CHANGES.txt | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index f4cec4ea23e..a7818829059 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -1,5 +1,8 @@
 Lucene Change Log
 
+For more information on past and future Lucene versions, please see:
+http://s.apache.org/luceneversions
+
 ======================= Trunk (not yet released) =======================
 
 Changes in backwards compatibility policy
diff --git a/lucene/contrib/CHANGES.txt b/lucene/contrib/CHANGES.txt
index 58cd38e5788..6368af6935e 100644
--- a/lucene/contrib/CHANGES.txt
+++ b/lucene/contrib/CHANGES.txt
@@ -1,5 +1,8 @@
 Lucene contrib change Log
 
+For more information on past and future Lucene versions, please see:
+http://s.apache.org/luceneversions
+
 ======================= Trunk (not yet released) =======================
   
 Build
diff --git a/modules/analysis/CHANGES.txt b/modules/analysis/CHANGES.txt
index e2b616e110f..75698330ccb 100644
--- a/modules/analysis/CHANGES.txt
+++ b/modules/analysis/CHANGES.txt
@@ -1,5 +1,8 @@
 Analysis Module Change Log
 
+For more information on past and future Lucene versions, please see:
+http://s.apache.org/luceneversions
+
 ======================= Trunk (not yet released) =======================
    
 API Changes
diff --git a/modules/benchmark/CHANGES.txt b/modules/benchmark/CHANGES.txt
index 2205f6e4a07..8920d95b269 100644
--- a/modules/benchmark/CHANGES.txt
+++ b/modules/benchmark/CHANGES.txt
@@ -2,6 +2,9 @@ Lucene Benchmark Contrib Change Log
 
 The Benchmark contrib package contains code for benchmarking Lucene in a variety of ways.
 
+For more information on past and future Lucene versions, please see:
+http://s.apache.org/luceneversions
+
 05/25/2011
   LUCENE-3137: ExtractReuters supports out-dir param suffixed by a slash. (Doron Cohen)
 

From 41c0976f9e36d2dea879a81f765dba9a5bbbddc4 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 31 May 2011 14:25:27 +0000
Subject: [PATCH 15/20] LUCENE-3165: fail nicely if you try to do things that
 need a subversion checkout

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1129694 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/build.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lucene/build.xml b/lucene/build.xml
index 45165a325f6..34e885698e9 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -376,7 +376,7 @@
   <!-- ================================================================== -->
   <!-- Populates properties svn.URL and svn.Revision using "svn info".    -->
   <!-- ================================================================== -->
-  <target name="get-svn-info">
+  <target name="get-svn-info" depends="check-svn">
     <exec dir="." executable="${svn.exe}" outputproperty="svn.info" failonerror="true">
       <arg value="info"/>
     </exec>
@@ -392,6 +392,16 @@
     </loadproperties>
   </target>
 
+   <target name="check-svn">
+    <sequential>
+      <exec dir="." executable="${svnversion.exe}" outputproperty="svn.ver"/>
+      <fail message="A subversion checkout is required for this target">
+        <condition>
+           <equals arg1="${svn.ver}" arg2="exported"/>
+        </condition>
+      </fail>
+    </sequential>
+  </target>
 
   <!-- ================================================================== -->
   <!-- same as package-tgz-src. it is just here for compatibility.        -->

From a890a8f5b015d525071c382f4e9a39ab6cd691f9 Mon Sep 17 00:00:00 2001
From: Shai Erera <shaie@apache.org>
Date: Wed, 1 Jun 2011 07:55:55 +0000
Subject: [PATCH 16/20] LUCENE-3146: IndexReader.setNorms is no op if one of
 the field instances omits norms

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1130039 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/CHANGES.txt                                   |  3 +++
 .../apache/lucene/index/TestFieldNormModifier.java   | 12 ++++++++++--
 .../apache/lucene/misc/TestLengthNormModifier.java   | 10 +++++-----
 .../src/java/org/apache/lucene/document/Field.java   |  8 ++++----
 .../java/org/apache/lucene/index/IndexReader.java    |  5 +++--
 .../java/org/apache/lucene/index/SegmentReader.java  |  6 ++++--
 6 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index a7818829059..b8295f9b845 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -236,6 +236,9 @@ Changes in Runtime Behavior
   
   (Mike McCandless, Michael Busch, Simon Willnauer)
 
+* LUCENE-3146: IndexReader.setNorm throws IllegalStateException if the field
+  does not store norms. (Shai Erera, Mike McCandless)
+  
 API Changes
 
 * LUCENE-2302, LUCENE-1458, LUCENE-2111, LUCENE-2514: Terms are no longer
diff --git a/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java b/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
index a3ad664e05e..9af69bba012 100644
--- a/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
+++ b/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
@@ -86,7 +86,11 @@ public class TestFieldNormModifier extends LuceneTestCase {
   
   public void testMissingField() throws Exception {
     FieldNormModifier fnm = new FieldNormModifier(store, s);
-    fnm.reSetNorms("nobodyherebutuschickens");
+    try {
+      fnm.reSetNorms("nobodyherebutuschickens");
+    } catch (IllegalStateException e) {
+      // expected
+    }
   }
   
   public void testFieldWithNoNorm() throws Exception {
@@ -101,7 +105,11 @@ public class TestFieldNormModifier extends LuceneTestCase {
     r.close();
     
     FieldNormModifier fnm = new FieldNormModifier(store, s);
-    fnm.reSetNorms("nonorm");
+    try {
+      fnm.reSetNorms("nonorm");
+    } catch (IllegalStateException e) {
+      // expected
+    }
     
     // nothing should have changed
     r = IndexReader.open(store, false);
diff --git a/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java b/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
index ad290c7e490..0313e83f6ae 100644
--- a/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
+++ b/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
@@ -92,12 +92,12 @@ public class TestLengthNormModifier extends LuceneTestCase {
       super.tearDown();
     }
     
-    public void testMissingField() {
+    public void testMissingField() throws Exception {
 	FieldNormModifier fnm = new FieldNormModifier(store, s);
 	try {
 	    fnm.reSetNorms("nobodyherebutuschickens");
-	} catch (Exception e) {
-	    assertNull("caught something", e);
+	} catch (IllegalStateException e) {
+	    // expected
 	}
     }
 	
@@ -115,8 +115,8 @@ public class TestLengthNormModifier extends LuceneTestCase {
 	FieldNormModifier fnm = new FieldNormModifier(store, s);
 	try {
 	    fnm.reSetNorms("nonorm");
-	} catch (Exception e) {
-	    assertNull("caught something", e);
+	} catch (IllegalStateException e) {
+	  // expected
 	}
 
 	// nothing should have changed
diff --git a/lucene/src/java/org/apache/lucene/document/Field.java b/lucene/src/java/org/apache/lucene/document/Field.java
index 6c6bccb79f1..d83b81cf55f 100644
--- a/lucene/src/java/org/apache/lucene/document/Field.java
+++ b/lucene/src/java/org/apache/lucene/document/Field.java
@@ -96,7 +96,7 @@ public final class Field extends AbstractField implements Fieldable {
     },
 
     /** Expert: Index the field's value without an Analyzer,
-     * and also disable the storing of norms.  Note that you
+     * and also disable the indexing of norms.  Note that you
      * can also separately enable/disable norms by calling
      * {@link Field#setOmitNorms}.  No norms means that
      * index-time field and document boosting and field
@@ -104,11 +104,11 @@ public final class Field extends AbstractField implements Fieldable {
      * less memory usage as norms take up one byte of RAM
      * per indexed field for every document in the index,
      * during searching.  Note that once you index a given
-     * field <i>with</i> norms enabled, disabling norms will
+     * field <i>with</i> norms disabled, enabling norms will
      * have no effect.  In other words, for this to have the
-     * above described effect on a field, all instances of
+     * above described effect on a field, one instance of
      * that field must be indexed with NOT_ANALYZED_NO_NORMS
-     * from the beginning. */
+     * at some point. */
     NOT_ANALYZED_NO_NORMS {
       @Override
       public boolean isIndexed()  { return true;  }
diff --git a/lucene/src/java/org/apache/lucene/index/IndexReader.java b/lucene/src/java/org/apache/lucene/index/IndexReader.java
index b0f87f1913b..750cd75565a 100644
--- a/lucene/src/java/org/apache/lucene/index/IndexReader.java
+++ b/lucene/src/java/org/apache/lucene/index/IndexReader.java
@@ -1025,8 +1025,8 @@ public abstract class IndexReader implements Cloneable,Closeable {
    * length normalization}.  Thus, to preserve the length normalization
    * values when resetting this, one should base the new value upon the old.
    *
-   * <b>NOTE:</b> If this field does not store norms, then
-   * this method call will silently do nothing.
+   * <b>NOTE:</b> If this field does not index norms, then
+   * this method throws {@link IllegalStateException}.
    *
    * @see #norms(String)
    * @see Similarity#decodeNormValue(byte)
@@ -1037,6 +1037,7 @@ public abstract class IndexReader implements Cloneable,Closeable {
    *  has this index open (<code>write.lock</code> could not
    *  be obtained)
    * @throws IOException if there is a low-level IO error
+   * @throws IllegalStateException if the field does not index norms
    */
   public synchronized  void setNorm(int doc, String field, byte value)
           throws StaleReaderException, CorruptIndexException, LockObtainFailedException, IOException {
diff --git a/lucene/src/java/org/apache/lucene/index/SegmentReader.java b/lucene/src/java/org/apache/lucene/index/SegmentReader.java
index 0e674311384..21bbcc1d15c 100644
--- a/lucene/src/java/org/apache/lucene/index/SegmentReader.java
+++ b/lucene/src/java/org/apache/lucene/index/SegmentReader.java
@@ -566,8 +566,10 @@ public class SegmentReader extends IndexReader implements Cloneable {
   protected void doSetNorm(int doc, String field, byte value)
           throws IOException {
     SegmentNorms norm = norms.get(field);
-    if (norm == null)                             // not an indexed field
-      return;
+    if (norm == null) {
+      // field does not store norms
+      throw new IllegalStateException("Cannot setNorm for field " + field + ": norms were omitted");
+    }
 
     normsDirty = true;
     norm.copyOnWrite()[doc] = value;                    // set the value

From 7f5305ecfc486c6b34fb399471f22ae99ace2d0b Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Wed, 1 Jun 2011 08:22:23 +0000
Subject: [PATCH 17/20] SOLR-2279: use Lucene's MockDirectoryWrapper in Solr
 tests

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1130042 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/lucene/util/LuceneTestCase.java    |  2 +-
 solr/build.xml                                |  5 ++-
 solr/common-build.xml                         |  1 +
 solr/contrib/analysis-extras/build.xml        |  2 ++
 solr/contrib/clustering/build.xml             |  2 ++
 solr/contrib/dataimporthandler/build.xml      |  4 +++
 solr/contrib/extraction/build.xml             |  2 ++
 solr/contrib/uima/build.xml                   |  2 ++
 .../org/apache/solr/SolrTestCaseJ4.java       | 12 +++++++
 .../solr/util/AbstractSolrTestCase.java       |  1 +
 .../apache/solr/TestSolrCoreProperties.java   |  1 +
 .../solrj/embedded/JettyWebappTest.java       |  1 +
 .../embedded/MergeIndexesEmbeddedTest.java    |  2 ++
 .../embedded/MultiCoreExampleJettyTest.java   |  2 ++
 .../solr/core/MockDirectoryFactory.java       | 35 +++++++++++++++++++
 15 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 solr/src/test/org/apache/solr/core/MockDirectoryFactory.java

diff --git a/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java b/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
index 557d6f64acd..4574d631fff 100644
--- a/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
+++ b/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
@@ -221,7 +221,7 @@ public abstract class LuceneTestCase extends Assert {
   private static TimeZone timeZone;
   private static TimeZone savedTimeZone;
 
-  private static Map<MockDirectoryWrapper,StackTraceElement[]> stores;
+  protected static Map<MockDirectoryWrapper,StackTraceElement[]> stores;
 
   private static final String[] TEST_CODECS = new String[] {"MockSep", "MockFixedIntBlock", "MockVariableIntBlock", "MockRandom"};
 
diff --git a/solr/build.xml b/solr/build.xml
index a1f90570756..8ca35e2b0d1 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -463,9 +463,8 @@
       <sysproperty key="testmethod" value="${testmethod}"/>
       <!-- set whether or not nightly tests should run -->
       <sysproperty key="tests.nightly" value="${tests.nightly}"/>
-      <!-- TODO: why is this unconditionally set to "" above? disable for now
-         <jvmarg line="${dir.prop}"/>
-      -->
+      <sysproperty key="tests.directory" value="${tests.directory}"/>
+      <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
       <jvmarg line="${args}"/>
 
       <formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
diff --git a/solr/common-build.xml b/solr/common-build.xml
index cdda84e1936..d5671ea379d 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -68,6 +68,7 @@
   <property name="tests.seed" value="random" />
   <property name="tests.nightly" value="false" />
   <property name="tests.verbose" value="false" />
+  <property name="tests.directory" value="random" />
 
   <condition property="dir.prop" value="-Dsolr.directoryFactory=solr.StandardDirectoryFactory">
     <isset property="use.fsdir"/>
diff --git a/solr/contrib/analysis-extras/build.xml b/solr/contrib/analysis-extras/build.xml
index 6ec8ecdbaa8..8fd22d099fb 100644
--- a/solr/contrib/analysis-extras/build.xml
+++ b/solr/contrib/analysis-extras/build.xml
@@ -159,6 +159,8 @@
       <sysproperty key="jetty.testMode" value="1"/>
       <sysproperty key="tempDir" file="${junit.output.dir}"/>
       <sysproperty key="testmethod" value="${testmethod}"/>
+      <sysproperty key="tests.directory" value="${tests.directory}"/>
+      <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
       <jvmarg line="${args}"/>
       <formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
       <classpath refid="test.classpath"/>
diff --git a/solr/contrib/clustering/build.xml b/solr/contrib/clustering/build.xml
index 9a0c67eaa2f..896b87ed8df 100644
--- a/solr/contrib/clustering/build.xml
+++ b/solr/contrib/clustering/build.xml
@@ -131,6 +131,8 @@
       <sysproperty key="jetty.testMode" value="1"/>
       <sysproperty key="tempDir" file="${junit.output.dir}"/>
       <sysproperty key="testmethod" value="${testmethod}"/>
+      <sysproperty key="tests.directory" value="${tests.directory}"/>
+      <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
       <jvmarg line="${args}"/>
       <formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
       <classpath refid="test.classpath"/>
diff --git a/solr/contrib/dataimporthandler/build.xml b/solr/contrib/dataimporthandler/build.xml
index 79a0524fcc7..a173dc0c5a7 100644
--- a/solr/contrib/dataimporthandler/build.xml
+++ b/solr/contrib/dataimporthandler/build.xml
@@ -183,6 +183,8 @@
       <sysproperty key="jetty.testMode" value="1"/>
       <sysproperty key="tempDir" file="${tempDir}"/>
       <sysproperty key="testmethod" value="${testmethod}"/>
+      <sysproperty key="tests.directory" value="${tests.directory}"/>
+      <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
       <jvmarg line="${args}"/>
       <formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
       <classpath refid="test.classpath"/>
@@ -245,6 +247,8 @@
       <sysproperty key="jetty.testMode" value="1"/>
       <sysproperty key="tempDir" file="${tempDir}"/>
       <sysproperty key="testmethod" value="${testmethod}"/>
+      <sysproperty key="tests.directory" value="${tests.directory}"/>
+      <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
       <jvmarg line="${args}"/>
       <formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
       <classpath refid="test.extras.classpath"/>
diff --git a/solr/contrib/extraction/build.xml b/solr/contrib/extraction/build.xml
index 50dcb4983d5..e0ea1ff00f6 100644
--- a/solr/contrib/extraction/build.xml
+++ b/solr/contrib/extraction/build.xml
@@ -128,6 +128,8 @@
       <sysproperty key="jetty.testMode" value="1"/>
       <sysproperty key="tempDir" file="${tempDir}"/>
       <sysproperty key="testmethod" value="${testmethod}"/>
+      <sysproperty key="tests.directory" value="${tests.directory}"/>
+      <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
       <jvmarg line="${args}"/>
       <formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
       <classpath refid="test.classpath"/>
diff --git a/solr/contrib/uima/build.xml b/solr/contrib/uima/build.xml
index 16c7de67844..95e2060f7b3 100644
--- a/solr/contrib/uima/build.xml
+++ b/solr/contrib/uima/build.xml
@@ -124,6 +124,8 @@
       <sysproperty key="jetty.insecurerandom" value="1"/>
       <sysproperty key="tempDir" file="${tempDir}"/>
       <sysproperty key="testmethod" value="${testmethod}"/>
+      <sysproperty key="tests.directory" value="${tests.directory}"/>
+      <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
       <jvmarg line="${args}"/>
       <formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
       <classpath refid="test.classpath"/>
diff --git a/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java b/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java
index d76996dd3ae..9a5ce81827b 100755
--- a/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java
@@ -19,6 +19,7 @@
 package org.apache.solr;
 
 
+import org.apache.lucene.store.MockDirectoryWrapper;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.noggit.CharArr;
 import org.apache.noggit.JSONUtil;
@@ -72,6 +73,16 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
     resetExceptionIgnores();
     endTrackingSearchers();
   }
+  
+  // SOLR-2279: hack to shut these directories down
+  // we still keep the ability to track open index files this way
+  public static void closeDirectories() throws Exception {
+    for (MockDirectoryWrapper d : stores.keySet()) {
+      if (d.isOpen()) {
+        d.close();
+      }
+    }
+  }
 
   @Override
   public void setUp() throws Exception {
@@ -270,6 +281,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
   public static void deleteCore() throws Exception {
     log.info("###deleteCore" );
     if (h != null) { h.close(); }
+    closeDirectories();
     if (dataDir != null) {
       String skip = System.getProperty("solr.test.leavedatadir");
       if (null != skip && 0 != skip.trim().length()) {
diff --git a/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java b/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java
index 8f0382e131b..eb45e1870b8 100644
--- a/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java
+++ b/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java
@@ -191,6 +191,7 @@ public abstract class AbstractSolrTestCase extends LuceneTestCase {
     }
 
     if (h != null) { h.close(); }
+    SolrTestCaseJ4.closeDirectories();
     String skip = System.getProperty("solr.test.leavedatadir");
     if (null != skip && 0 != skip.trim().length()) {
       System.err.println("NOTE: per solr.test.leavedatadir, dataDir will not be removed: " + dataDir.getAbsolutePath());
diff --git a/solr/src/test/org/apache/solr/TestSolrCoreProperties.java b/solr/src/test/org/apache/solr/TestSolrCoreProperties.java
index d848d8e784c..28f6198420d 100644
--- a/solr/src/test/org/apache/solr/TestSolrCoreProperties.java
+++ b/solr/src/test/org/apache/solr/TestSolrCoreProperties.java
@@ -59,6 +59,7 @@ public class TestSolrCoreProperties extends LuceneTestCase {
   @Override
   public void tearDown() throws Exception {
     solrJetty.stop();
+    SolrTestCaseJ4.closeDirectories();
     AbstractSolrTestCase.recurseDelete(homeDir);
     super.tearDown();
   }
diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java b/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
index ab67aad3fc2..161da30bd8a 100644
--- a/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
@@ -78,6 +78,7 @@ public class JettyWebappTest extends LuceneTestCase
     try {
       server.stop();
     } catch( Exception ex ) {}
+    SolrTestCaseJ4.closeDirectories();
     super.tearDown();
   }
   
diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java b/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java
index 1a9164867bc..59bf574b607 100644
--- a/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java
@@ -33,6 +33,8 @@ public class MergeIndexesEmbeddedTest extends MergeIndexesExampleTestBase {
 
   @Override
   public void setUp() throws Exception {
+    // TODO: fix this test to use MockDirectoryFactory
+    System.clearProperty("solr.directoryFactory");
     super.setUp();
 
     File home = new File(getSolrHome());
diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java b/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
index 8fe4b69196f..2d637f06f35 100644
--- a/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
@@ -38,6 +38,8 @@ public class MultiCoreExampleJettyTest extends MultiCoreExampleTestBase {
   
   @Override public void setUp() throws Exception 
   {    
+    // TODO: fix this test to use MockDirectoryFactory
+    System.clearProperty("solr.directoryFactory");
     super.setUp();
 
     jetty = new JettySolrRunner( context, 0 );
diff --git a/solr/src/test/org/apache/solr/core/MockDirectoryFactory.java b/solr/src/test/org/apache/solr/core/MockDirectoryFactory.java
new file mode 100644
index 00000000000..c488c416e18
--- /dev/null
+++ b/solr/src/test/org/apache/solr/core/MockDirectoryFactory.java
@@ -0,0 +1,35 @@
+package org.apache.solr.core;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.util.LuceneTestCase;
+
+/**
+ * Opens a directory with {@link LuceneTestCase#newFSDirectory(File)}
+ */
+public class MockDirectoryFactory extends DirectoryFactory {
+
+  @Override
+  public Directory open(String path) throws IOException {
+    return LuceneTestCase.newFSDirectory(new File(path));
+  }
+}

From 402c76d7005fa62924b299c5e86570275beeff08 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Wed, 1 Jun 2011 08:46:52 +0000
Subject: [PATCH 18/20] SOLR-2279: move to test-framework, and add consistency
 for IDE users

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1130052 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/lucene/util/LuceneTestCase.java              | 6 ++++++
 .../org/apache/solr/core/MockDirectoryFactory.java          | 0
 2 files changed, 6 insertions(+)
 rename solr/src/{test => test-framework}/org/apache/solr/core/MockDirectoryFactory.java (100%)

diff --git a/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java b/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
index 4574d631fff..4a58023d466 100644
--- a/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
+++ b/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
@@ -620,6 +620,12 @@ public abstract class LuceneTestCase extends Assert {
     for (Thread t : Thread.getAllStackTraces().keySet()) {
       rogueThreads.put(t, true);
     }
+    
+    // enable this by default, for IDE consistency with ant tests (as its the default from ant)
+    // TODO: really should be in solr base classes, but some extend LTC directly.
+    if (System.getProperty("solr.directoryFactory") == null) {
+      System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockDirectoryFactory");
+    }
   }
 
   /**
diff --git a/solr/src/test/org/apache/solr/core/MockDirectoryFactory.java b/solr/src/test-framework/org/apache/solr/core/MockDirectoryFactory.java
similarity index 100%
rename from solr/src/test/org/apache/solr/core/MockDirectoryFactory.java
rename to solr/src/test-framework/org/apache/solr/core/MockDirectoryFactory.java

From 8b6be652b22b6ae88cc800d2c5b371a99296a44c Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Wed, 1 Jun 2011 09:04:02 +0000
Subject: [PATCH 19/20] SOLR-2279: move to beforeClass, so a test doesn't
 disable it for subsequent tests in the same jvm

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1130063 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/lucene/util/LuceneTestCase.java     | 14 ++++++++------
 .../solrj/embedded/MultiCoreEmbeddedTest.java      |  2 ++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java b/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
index 4a58023d466..655d81b092a 100644
--- a/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
+++ b/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
@@ -341,6 +341,14 @@ public abstract class LuceneTestCase extends Assert {
     random.setSeed(staticSeed);
     tempDirs.clear();
     stores = Collections.synchronizedMap(new IdentityHashMap<MockDirectoryWrapper,StackTraceElement[]>());
+    
+    // enable this by default, for IDE consistency with ant tests (as its the default from ant)
+    // TODO: really should be in solr base classes, but some extend LTC directly.
+    // we do this in beforeClass, because some tests currently disable it
+    if (System.getProperty("solr.directoryFactory") == null) {
+      System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockDirectoryFactory");
+    }
+    
     savedCodecProvider = CodecProvider.getDefault();
     if ("random".equals(TEST_CODECPROVIDER)) {
       if ("randomPerField".equals(TEST_CODEC)) {
@@ -620,12 +628,6 @@ public abstract class LuceneTestCase extends Assert {
     for (Thread t : Thread.getAllStackTraces().keySet()) {
       rogueThreads.put(t, true);
     }
-    
-    // enable this by default, for IDE consistency with ant tests (as its the default from ant)
-    // TODO: really should be in solr base classes, but some extend LTC directly.
-    if (System.getProperty("solr.directoryFactory") == null) {
-      System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockDirectoryFactory");
-    }
   }
 
   /**
diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java b/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java
index be95da03555..ede29c58afd 100644
--- a/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java
@@ -32,6 +32,8 @@ public class MultiCoreEmbeddedTest extends MultiCoreExampleTestBase {
 
   @Override public void setUp() throws Exception 
   {
+    // TODO: fix this test to use MockDirectoryFactory
+    System.clearProperty("solr.directoryFactory");
     super.setUp();
     
     File home = new File( getSolrHome() );

From 914d18a2b5c6ca740500ac0c341218a6743e4063 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryan@apache.org>
Date: Wed, 1 Jun 2011 13:40:50 +0000
Subject: [PATCH 20/20] LUCENE-1344 -- adding OSGi packaging to maven build
 script

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1130150 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-tools/maven/pom.xml.template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 5c026af66d1..d6d603b48ca 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -561,6 +561,31 @@
           </execution>
         </executions>
       </plugin>
+      
+      <!-- Adding OSGI metadata to the JAR without changing the packaging type. -->
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.4</version>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      
     </plugins>
   </build>
   <profiles>