lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r928246 [6/6] - in /lucene/java/branches/flex_1458: ./ backwards/src/ backwards/src/java/org/apache/lucene/search/ backwards/src/test/org/apache/lucene/analysis/ backwards/src/test/org/apache/lucene/document/ backwards/src/test/org/apache/l...
Date Sat, 27 Mar 2010 19:12:13 GMT
Modified: lucene/java/branches/flex_1458/docs/lucene-contrib/index.pdf
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/lucene-contrib/index.pdf?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/lucene-contrib/index.pdf (original)
+++ lucene/java/branches/flex_1458/docs/lucene-contrib/index.pdf Sat Mar 27 19:12:08 2010
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 1038 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1002 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gb!$G9lldX&;KZQ'fnA\X-,_q*1KWCkk*<&Df$!fb;L"BNkfYi?f.-I@I6fU\Pso>EFa6h4KNf#9)$N^LW=q$O>=+Hc^=OLB8gY=S1s`s,W4IJ+eq>fOQDLMT7>X/q,Z=6KnpDP2udp><JB.bJ)>RNX&^$4GN:,SIYNtp_Z,RB0q=1Kj[%B*\'1F9gP%Jnk4O&q4,<6'eM_i*P&PTt+(rH4-ohasY!7rA`Ds9>a3auT2e5]l>P.r&k$L\n@'5U8`@/<Cjt[4@32=r"GS*bt&YE'+H2=@Zit(n.bXL#I4#(eJ=jJXrR8J?4[@V(c\J+,N*MsECHL>1()ok1B.c9YLrToa)9Q$01!uPPpl@Hie?kgBHp_$q@VU/52\V"VaL^eZ"jYSoRh\M\u$,<Uj?6=]+%XK:>?k*>QZ=o[E`NQVF?+d2MXnBO=^FaCqh-nQcgr%.\YUI6,%lZ;N0,;]^Rn9D`aYYr60<1lQoe*ONXZVMDa?*qk_AjgU'!ZPA)98)!]I[rrg3/bLju@TE([rhA.`U-iH"+il_G9K5IC]Gh!kKDg'g!"[ZUADAgl5HGPcu[,r$G#Fe6j7)F9H%g:/ceA*5mesq_:a'&mc&?TD"[jHnJL/c5gok6k%h=6,r]0'=5V*6*#uk]7iQjlEI%D>c<@E'a+-=*Ac2)6,WTT.du$@JL8mWdUm!I1i1s)=_<oFln_bH9(1,>l#rs/5DaJugl,BNPgJbs=lrqR5Pof(9ppY/*Pc&0ObA]51(0$RRY02aU%2qjH7S-<$t]TUfXMa(a=*`B(=gG)]Y7RLj>8^g8L.a)B$<T:KOaOWm+&,WI.+,OITkgN"dt"6*#)(?].faoXS&Sk^/%ET7G@h\I,lDW@bQRqKXY6tYbksiad&4p#CdK`drP.k%rUb@.VCJq@=)Mq/O=\/d>G#<?YB,q^fU0SL!`<,Tg\(W>Y:GSP,,>4pd=sUmn_[(R"p=L+%#Ol,oDPpee0&7?QU&
 5X4Q_ne**8k,E8o;eeLVfAN;U6fF;RGGjMVK70iJB-O,+m~>
+Gb!$G9lldX&;KZQ'fnA\X85)/*1KWCkk*:P\$cNnjd6>Y8)UuHYO>*%Y]cm//lfu'*1:(]%uXc-dVZSjE%d%R-mRtg_<a\+@,u=D$%j<p')PrO0Iju-Uc\-qq/N%g>CAk>,)Y@9o#i3.'l'rOII"&=>#RQ=OImfs$mS8q^PmOpS;J$B1@0`gZ\QtOU$Smm]c$gpTfZPf:#DQeS6bj/RBR\]:4oM2O5jnn(%'FhoK^b4fb:k2rVr5_=(3ZH'p,7/7CUTJ8P-l=SW:Pp8_$7W<b:CWO#Dt^gbU`&@0\rRR4HF+AhhPhij5ZX9RFl%Zh`BB'%4;QQBU)`r]sW]G*eUETChj=B#u!B5utiD31'n>nS=2Lq"h:M<oV=TVn#/QkS[CLgaIVU4DmgeD7/p1!%bJCKkps7+HV\=e''5Sa:Ia:fU%eJ#.Im.HgYR9)oWUndt45-=f^/GkB4R%A20"1.3rHo1c("B%s_<jPA7^`/*Odd3T)ZQOJ!n`i&H1`GI9GV-O8cfRK%S+#Tfe#ZVff9,,9fsdH'/8?_CgZ%IH#GbTp:ajN>JZRA34XcNe;^qogl\(#1BD*H=K5_)*nAb!F&B\1)L;.)?N4g:%OYarL(cScK;TRmG*i\0H(A.)E]HDY8?a('$/&d)&P2JU-%8=_=2Nln_bG9(1,>jdo6Wc4\7O\0Z4G.&#>[Z@kA`ro@uegG6t9%DZ@#Ob/Si0aEXMRY*?fU%7J?H7(Tm)&srcY]22UOAS>c/?25?n+G4'2$4bE#*Q310BSp)_Qe>8p3L"T^3:LR4rnZ;Q>.<Uga#e%E>Rc!;8TRrlUq%<6b!itBk.];Ef_q/mD<hZmp3JESn-s)Ph6&\<sASf/tUlrVE7`;/><aC'\kDa.$5]CPKi+Qimo0%MZ1.?)N-"?kQI,#7?^Q1":Y#4nQigm)7tYFN])@m`J9ae/0%hB4taN455eN#g1+aA2tp>k@3)F"MUKXfBXk;deCO-AJ*Ag
 2d/O/`lqd]~>
 endstream
 endobj
 6 0 obj
@@ -43,7 +43,6 @@ endobj
 44 0 R
 46 0 R
 48 0 R
-50 0 R
 ]
 endobj
 8 0 obj
@@ -109,7 +108,7 @@ endobj
 20 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 450.466 231.476 438.466 ]
+/Rect [ 108.0 450.466 138.164 438.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 21 0 R
@@ -119,7 +118,7 @@ endobj
 22 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 432.266 138.164 420.266 ]
+/Rect [ 108.0 432.266 178.832 420.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 23 0 R
@@ -129,7 +128,7 @@ endobj
 24 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 414.066 178.832 402.066 ]
+/Rect [ 108.0 414.066 144.836 402.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 25 0 R
@@ -139,7 +138,7 @@ endobj
 26 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 395.866 144.836 383.866 ]
+/Rect [ 108.0 395.866 163.496 383.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 27 0 R
@@ -149,7 +148,7 @@ endobj
 28 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 377.666 168.496 365.666 ]
+/Rect [ 108.0 377.666 151.168 365.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 29 0 R
@@ -159,7 +158,7 @@ endobj
 30 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 359.466 151.168 347.466 ]
+/Rect [ 108.0 359.466 185.14 347.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 31 0 R
@@ -169,7 +168,7 @@ endobj
 32 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 341.266 185.14 329.266 ]
+/Rect [ 108.0 341.266 163.156 329.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 33 0 R
@@ -179,7 +178,7 @@ endobj
 34 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 323.066 155.152 311.066 ]
+/Rect [ 108.0 323.066 161.824 311.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 35 0 R
@@ -189,7 +188,7 @@ endobj
 36 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 304.866 161.824 292.866 ]
+/Rect [ 108.0 304.866 159.832 292.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 37 0 R
@@ -199,7 +198,7 @@ endobj
 38 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 286.666 159.832 274.666 ]
+/Rect [ 108.0 286.666 188.476 274.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 39 0 R
@@ -209,7 +208,7 @@ endobj
 40 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 268.466 188.476 256.466 ]
+/Rect [ 108.0 268.466 171.16 256.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 41 0 R
@@ -219,7 +218,7 @@ endobj
 42 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 250.266 171.16 238.266 ]
+/Rect [ 108.0 250.266 157.168 238.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 43 0 R
@@ -229,7 +228,7 @@ endobj
 44 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 232.066 157.168 220.066 ]
+/Rect [ 108.0 232.066 175.828 220.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 45 0 R
@@ -239,7 +238,7 @@ endobj
 46 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 213.866 175.828 201.866 ]
+/Rect [ 108.0 213.866 167.824 201.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 47 0 R
@@ -249,7 +248,7 @@ endobj
 48 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 195.666 167.824 183.666 ]
+/Rect [ 108.0 195.666 211.804 183.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 49 0 R
@@ -257,279 +256,261 @@ endobj
 >>
 endobj
 50 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 177.466 211.804 165.466 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 51 0 R
-/H /I
->>
-endobj
-52 0 obj
 << /Length 1855 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 Gau0DgMZ%0&:O:S#lBhd#qbGFm8Go;[U!\cmD^_S1ju#C3p'T]?&FN'IXO`\OXrM4g*/dudN[jpB$SWa_d[eqR/Jlu8Iu*'D%rTPV8]?JL4Nd3#@mVNY9/a,BG/e`>R16iDXm[g\qJdtTt%@trA+8SR*BPtK,+tK<\r3LR)'7$7ucf4A&I>uZ.KtES5F<E>[$5HB:ndOVn?5@b>^!s4?*6r(8!(YBmJCP=pNe*J`emo3+5(N)tqd#%;JmXoMr+DEVrF]`L9T'n;0<6DREF6)io*M_3.K8WsJ?/,0eL'h:K>>Rr$+hIdmbtRuR<OPuLtjP36_$PKJ<26m-K\0Vrklhc_fY<c.5#j;gnRV0oj=^VJGTA>;BkjGkJ49<$P,Pf/#B?L-'2.ZRTbXjELem)1_%QP/m[Sq'GP_hV:)ThEV`lMXmu#?&.@&eAc;-"<,RcN'2#o*I#@qA=f9m,.J2?u<+c',ms^;FC7)('g',[Db*VhAp:[\bR8g^S@2ND-==O?Im#5C_eOh,]YQd#P@obNoT&$N>gm^`2ek!BcHc]ZhO-Fo348Ihl]V/kuNT-/^&"'5NDnRa\a'l#iR_>KZndd#_ee`@nJsq?^?_o[?,)l?I[3mJP/edbjLYg)N-pQLgD,DeMcQO_D+h2JR*ac!ST!%)iLdt%YY#q`,lj)[>@qNWVd's11c8*<1[j0jl7]#lu*6HT&ahD-.*OC7m%X[51a8,m,b9=FeN3%K3ra/8G?*HfL1ik8Y5VQ#'Wa\bfcZ@Ys`Va/s1V-VV,RX3*K`Bp_/`'5`t?rf^#m1:8[N&L9[eh0#j3Kbb_7=6+i0qlaq!t+5G>l#dsdNXAgAG;]bH["%p?dG_sr*6HLn'5*%A$#c0tS-`gC\#GqhB'N#>KNua^(VYQ=D7h#'lakD1p>F49#4]?@Oa,=Z:'T)&F>>ZoZI2q_%1-Vk%'=PHaep@(>52V9X+:OdSk!Z5)GuCYfq$j^#Iq[?A`kq2
 j;8gOSJ19\lWa2"UNZ?ej'E0[@h@Q4`[(BWoiT"9`Y.jr#L?L!qd7P[tJr)Ji]QZbeXnUcCLolunE^7hlC6K'?qr?tdb/TTW'0*6VL)(-.'F3'Uip^F,2D]/J54A)I[[)2jU4QrZN[kJ)"clckAK,`IV9c('4NbchckZ:]X;i@1rPR0PO#M7ri=W1p3XArg..O?Op4.E&:S?-q(D5Eng[tJNk3*S8B9F\.+b![fL'k[U@_1P\R0bG[E\&/@IG;0a<3F=jHV?0gP]tAT[]3JD?F!D,_7X[Hjoc3bs)LfA@72ub&[e!_?$eOZgEV-)D:p3,K4[Zo@kr]1kkX[bl8]iCD<_^sg?i9a&a)#MZ#'P(csa,7KBT<INCr"nDKmW8S%Y6W<[@X#Xr"^2_fcu^GA?tI+O'G/TLXX`K)*H\A*JYOenc):a"mK%Z*lb%m^#^0g4J8cHJf!CX,"*S7+lTsid.MSCtU//Sl5s-lK'24:`A?9)(?'?aE.Y:T\Fm`!X61#Y`UjE7K9!!cl`HY:Ig'670d<[B\3TM,n(g[/Q8-19W/K4$3XL)L$X:(.+IpH%os[aO?t/'U6:NF>)+c'[$8[3d^@^##4`q?0U(FeTd<ECW7<<BMd`=C^CG7]N^MUA,QLmkCmjpm"1=>MFT\.F"Q1il)$_i'I*_9_->J6W`0OY7>iY]HOIh06DRV6*H=5ga@e$%qdbFsZg_rMC5[jeHWs1jN<7;$Dm(bNr6JG\eTBg*jQ"M6rWEDXiKWO:QCtcQDV613:iYm@M#1J<^GL,CJWUdcrCqbHS\s6iq?FQqeVck3UQ0UNBdee@CX*/Al%ZhHg7*r2R(oeA-]<Q\,Tso@/0rgE:!"oZS'*~>
 endstream
 endobj
-53 0 obj
+51 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 52 0 R
+/Contents 50 0 R
 >>
 endobj
-54 0 obj
-<< /Length 1328 /Filter [ /ASCII85Decode /FlateDecode ]
+52 0 obj
+<< /Length 1335 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gb!#[gN)%,&:N/3nBmi,&6oP2d<=eK3pfV0-r3PZ+;0jan5^*`l[F8uRgD&bD5F"qN^aW^E3X'MS6^`US(3RheXn?+mG7Nm.Y.RhE?)Stb1c/=,6DhE,,:n"lIXSRMZt"!m+qX&Sj`psL!=K=4!WrQ.-_6Z"u2q$VMK]5qP;WK1[fLtg8Znk'[hB"VZ)Z)R8rKooR!t@WCHu?8-C28qbIf=ru"Ku'UaBV]_M#&1uK\tL_2S?!&>00k7Jn$ndm[uJ0WjE7Y$'sA%)'hKh6:p39?nsM?.!R;s4W65T&dWI5'2CB<%@>lI)]GO]GQF2#3g3@2drOo/0U1e&:!F0VAh:0`_:n4U#B';-f1c(.1?a`4VZHjpWq:7NRr;_a3`%\bfQA(("E0!h@VY$"6rC+n]/[-C9^te"GDhf4ck,`oh/>R2Mg3geY81[-8a$EKLq9n%NFK;NGdlRU^6)H'0<UnVB@O3CqibfVX80CZi#u\MJp/aEHpT]p"F]T2]PUZ[NAT1erRoBZ(HD6=7VmAMKjB%Es/%aP;%k>nN[Xs&]f'm6Op*3S-Hb[Zc(h*(gOQA+5K$[)t]he#6oRnHdhgFRt+4;X$WSp$u3)rE*7'I5;[3l&U2nX=Q/AZ<>44bf33/mhhg7C6`P%kDs%d`p6lu^#s71<M%Ie*/.-qj0h7u/IM5mog_F0@RTD2+5m8Hmae*2\4<_tO,LD83!>(_HHIuIin)Zu@2uKSs+eYOqn(2'i60[JEi@BcPkh\*<u#jXWmWNMj6'=<<MmK80<@+`<97G7CGD^i67F$e<)/um5YpnAhp3K^NceVF40'uc#sdOBJ\!mG/uU$d!"n+.I_ppt*-ENS*L1Kd=tOUG>S[Hr"TsF^Es77X!XT_S$Qj;9=`7lH!Wk.Mf2@N+V;14Irr0S[oaNlsf0Q$LrnhJ>ebu6R_/"hK=K,pp0kTiA5"<t6HgJ[+hg-trAMi6_MBg48j]$gDGA,ZRW2)SU\7=K
 jPJkpAIS=gr-kMUg+;Xb-EublJ^`o@q]%;)-dq9C5lGGb2WWu<@59Eg(W^UnBZIJP%J%"Ia</'eVZVRX=fjsDRQYMh!'Jf_Zn,^j&XtE3uU<M^.T2.-bbV_"6&r`L(E1r/l1cgk>mVsKlM9e-=DHhc!ESo8$m8N/mM$]6Jcbe/\qP>/!WmVe+]Z%9sXZ^'i83SN6IJ%9Kgl51*=c<XjJe&DWaF392GQB#@VoU/$F*C`RhNX.<ECn@u6!^k8le,QD5FV;Md-W3l7iZ,S)IWp3Bs\a5dg`r`FlQ9Jc9=eZc.lAjGB.HK#s>OVT*CkT`Z(sJR?Pe/Pdl2CK.k9`~>
+Gau1.968iG&:j6G'g12+'nSBdU[?QF3phli.&WpILkI$3I&J0%fDYAJ^'m7B-W3j%8!X-q\VpF[`S8r&kLJS\"UVX,H+/Sa_L[parc?Kc?4%Sq&X'rn@(l?>\G`9)-&=U+^UY-]Tl=GJ=l<Tl_]K0h5s^XO4BN?7+'5)A^'=-,.9C:j-G)U4YBK4bor-:g\ISTI<kf,F?kgQlAjQ19$0f/-Nh[^NgL1$?a*5@52kqdilm<]\_*#oYJ?Zk1heGb\8EaG=5oa#He$Wt_mj(^@no.LI.H3.$ns*X8Qlq$e#?*ctWNNA?XDIO[W$\Q;]D7[K41i)Sk%h,lmDdmb1g9-X&eRTDdcA7.:3AQ(6=Rm7@nu205_+`:iZK3N]55+&iR;Hr$Uasr)Y8$$#T@hU)RS@'Q*kMrU>"8W8Zq@4A[\S^&PKHNCNg0:,WfoL:/Z>l?-UM;%WJ3/2K.m@OE$*;AA&6$F4oYgo-it.SPP`1+Gf,I><9-tUn+@+AW.g.?HS[$neB5O8Ar(6J[BcRpXq15>eL@K;t^hR[hnJ4@UGD3D!'a;F."=SWkVfb>d#)FQ!=2jiY[*h)5>TZ<13RfH8.)MpY]S)]AH\e3>ta7WZdt*ks\R4jarVJ+b))sdj'^g'FGkM+t7UYWN7%=2OS<%3ZCsJieU"M\KSpYN5BgU)]s!I?`mD24Tqb`a%?&sEXI[VeN.n!Y\;jWhl,8PgS#nf"_=MNU7hO'AouI#k4s7%8[N22\+(@s'-S";8a<Bkqf"Q%E#=dp:&"MCiVE=jEPdN",5R<`cS,W";%bldP.+#Sc%ZI_,:&X9\$+.L+Mu-9G2n*LqgG%^#8ubrLW]5RaU+!bg-h9R2REfkB)=JNGiZkDKr`"O:T=J,dUf#8qC#o))2]g%4j'P'/r,d6a@>L`e+$<?\&-oT!fe;:KeE57Qm5:5hMpaPKOIqO@gDl7>4$@6%2<l&D;ofAL:#4u'"l^0ckp#(DLP>=HAmp
 %+YaD)P?ndFiA:I_3[BAZD-_9F*?npdMtobr?l)U>-aRcbZ6Ms$(QID?l\Ma*__B3bX0M(iR7oQ"O5/-c1IUE:.Ws:Q%6T8@rKE-dakP=G`ZJB$Sfa2r[;k[-H?'0LB\XjT>-smIo7#1/4nIg-"q_"#iB]hM2ka0@frJXSFI95j:f@%U03cV<h/HG\NQJhWTC-!'E%F\QiKTqi^u!Jk9Jjgf)e4o&E&@)ND1-!>3?Z-?8dINt_@U260+##I=Gid;eT?2<\Z>GMVAjOPk=,>W7Kp%IMQsOhe``EMiHVA0J#YEOP;:G/IFXWt?W3(3QKNG=l`Qed#5jNC7FlJY!@-*U&-~>
 endstream
 endobj
-55 0 obj
+53 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 54 0 R
+/Contents 52 0 R
 >>
 endobj
-56 0 obj
-<< /Length 1312 /Filter [ /ASCII85Decode /FlateDecode ]
+54 0 obj
+<< /Length 1303 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau1.997gc&BF8='Kd^-Qf1l;Nle#b[V14di`k.>/^ZI\=`Pp)+8tgPad,K/Eaf,.$pQ.s1W0%e3?3NN/q.%X^+Lhf_#*.9,FG,L8`3OgrqDuE*6XQjB@(D`C%:/o'*Q2sGl$6K7$PNIja'4I8H`?6*@=C5'-beDLOOaEPML'Dp;X4M\'n>phP*(iR!dB8C/^S5U<^BAWEOd]Vem0-bcZ,mIVc(%]\p9_:UL&]`%S#jN./MYF5FoDqFQ=sUQK!L"KP3.Nr!Z[C&]bVV@[beFT1FcO6Dr^8oZU5M[E-'O4':;aq*`o6REL?apoRn$q>iAD%f>T_3#T8'^<P7K(jOQO[#fNVNN"u^%]74['QV=1/tI;5YP>Gb1'_W0<]5,RNFjMH.`o4eR/1&)>F!+?"7.7UooTj;nFn>\6$,Y<OrY'rS$A1$H@@jRq>Cq&epgpX0]EdBmO4Pf%*iB`d:qAAM^A6.3qYYA$MI,0XoMoA.iOHmH&)G<._Ak;A0GfoX.2o+&JID'hS:qXqd5C";\4n;c-QWq)lS=*^:VhS&?#g$afN<[J;_^'lCZB!F8N#:h!bI^rsBjUBgDER5kib755aJ(9#p4>]jmsIgo!\U_X(oGjqK&.s37eQZ$_Vo!SoJCMWt)<-hQ!+a6Xbn*E8+Jn>`K')3H!Nt`RjiH@O'JjB%Jog0E6-B_mP1(T')bf7;cQ*=X)1I3ZR[UP"[@3q`4CdUo[gGY.`/dg@r>aPHs.T0hW$$3f3.pKkY1LG%08oZUU&A^E4rVpBe$#Fs\Zcb(CR6lbk'.+<"g=<;cbDD,cVb17<M=UlAm!)jnpZFfKpOhk=2<E\U]&jsp8W<E8Da2PMK&TBmf-c(Y9>)>hQ:];K[OrrG'MP%laFI'mLVhG3p^A:2VO2FM/Kg?uSFPr\5VWAI?JF7)9jqJ"2XVYg\hV#mhUJ]^/N:k5629[]<Q&cI_[YQj8]lE-YCHiq<mV)1plYn)FC]@]jaVd
 ?4D.&iV:`0aBa0!m3`b-.=$P@^L'TA0cj&'=0!)#J74hTiD)S7OC!'oaLE/F6P,<1TN5;'X$r_1.SeMS@T@M,1;E,/3-75<uaKorjmeSaLEP?d-8-,j.KE+Ll9i)2*.6D;?rEeZB4pJH2Q6n/aDUYGomlbVs=08g0-qPPW6e%nbo#K9ImUa/_osdtI)Q&2W\Deq&UHM*BW&LtG&M0-/6`M9V/;42Qs-]\0J7aX+9#-%>NVIq8Is(7IEi9DGl;RE^PLPX1+c.9mO3&7D6*c78Q[7IOCDU6$kRia_eMOBZrF#-N"ChNse<;>cceZ@,AW>(~>
+Gau0CgQ(#H&:O:Sn1asT%'R6)-AucgU'6^]hqC9@1+fht,t4QZh0scBOsQ8t.p3ZG$suI:B85T>)3-q_=$Nih?WRs'nG]pi#pq'X,5;kXs*Z6u`A4<hd:fl_]__-R"bL1A4oOe7,0Ji`HFG*9+p'ET`eBT7L^:@OT\nUn6XAo.0!2FV.bhGrNX[&eW,h24>?++MhkE?^qWBYIS7435HdpcO3LD^Get;5!D6*$a@b;.+8X^3NqJSZ6s"-g2+OoIcq<"$)kd5h3EA['T$;;]U&;Uq[,6D;j"JDT-9UK:.ifa5nl/oNW9rf3td/\?XE\'XA1F43$bJ4?kAO8)9F:A''Ke2oE)8C9]0(i@2cC?YZm#\h$gl:@NA:'@DA[B)D\@$Z:8G`f*rcWIm>Bhj&)LY0Y&qlWI>Pm3Rr95c[9kSnS45KZuo+E&f3,@7`b&a>HCi?E#D!+#p/,*87C/amVGHItWk+;[IMu&]*icn'Zcu1%]gW<PQM,U=Mf*b_Z$-pt%aQuUAVIt9J`$FaaH:@Q66Ae`M!SNMXhJQ$uX"#a?SM'9/k$6aZBb3#>D"@LUL;;pN:P"TI[O&)S5R:I_U6u)N;:+MoAb@5LJkIWt]p\s+=+qV=hA<2/K=^bK@BYUC=^A(pgW\&IY?QDMor#tI&O:4@*DeS0ol^c6KYk1^oaLAX5]>X<6c*?3Xe@?=l<U'=7gu:eE\0^bUfaM\C5P=noPS:s"23Mrg7$Tm1@p%QW)e8CFB^WRPkdcA3(krtZ3o6R@CRJ/,f.nPq0Mn1-"&`s-Nip];8B/srUl/VR_bo_nlc6#*()<M3pW]@H8=6:65YFm>+A4nLfbLkg+L]oHT#bqm!kd/171&L.Ch5YI7S7r-K>]R,Q@k8$mo"7l6\\>T?jZSWih+kM+a:FP-D!t,Q^J-oO@7"32bEBZ@5Dg%2H9-2a,`loMhInVXS1TIu8PlKINO<+RS`jg7NBe"dsCD]SWblm.,Zo'0)a
 6!(+BCOP`e`1u\L"]3[!%c=E?#=Y$b\Q/b\G$UUO@d7#UW68FGOCP5#7_i13_MT94'^0,TWWtLl+`t#HZPF"?*PN4N1Fl"OYGfkaUrpG?2"9e*<,ljtkN_g/R:j/l5pU/.5%75tFj,!Mdq0_GpHOnn5V/=F'i#*XWEIcFjSr0"F-@>6*'6s.39aU(SKVPp#G&!Ep&*!t7S!8liK2u(_j+R;N9)HmL8X'M5n7a)]YNk;jjSPW%j.o35G:';q(a5$JegGD@_ZO\Y+01qqWlD[Ad*$ngSU&mjO/"GJDEV2k_g'U6m'-@'hoM3q~>
 endstream
 endobj
-57 0 obj
+55 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 56 0 R
+/Contents 54 0 R
 >>
 endobj
-58 0 obj
-<< /Length 952 /Filter [ /ASCII85Decode /FlateDecode ]
+56 0 obj
+<< /Length 770 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatn%9iKe#&;KZL'fqXJKYD:FJLSfbkR<[q3n*dF&iig//>G1Xo[d/flpq2UO:IIGijC?)qL*Op3hM?p:I^Bi%-Hu)29HIu5R?=t)/l[uPS-M@!EOdKdI$/qbmB=o(-I"kaT3`+@$6RI3siG.#.o_^5_0c>/A[BCB.%(\g,2(MY*Ii"8@qdNhlIX"p=<ta<Q<UjE*R\KY*,WjEk0]=f%VPGf8n4D<l$gP\DF0Y(`oYmi(]LnDs/t.ce^3I/Sf2qGQN>Fad3eF:^gJ[^n"B^qcR^ciOZecPFS%T[nKEq_)+ds"jK9L\G>;99*)8<E-Um,($N/9$q8JO1Pe#Ma<^i8*P".CKHYOgd0>RR:14_-7[N^#`$eK-7NlEd4&RAFaAW3ra.5ga&&#l[=]VD!AXEc[[F4YE"kqKRjAW+iQ$"5C7b8#d?*C0+<.hhC:LU\m,iTPop$o7Gbol`6]cS%<R<pdFj2td)iX`Uu1G'+^,8d/6*K:IR:q6:)V\<Qt!)IKaWnnTi&1JF%#QjY:*Pes%jMOjr=mn9.1U,6H1Lb5H'OIm81Lf-67&"<^&<%<lQ)[#=Lp7X$L6!Y!.#3KG5sf"j/6#JlCL-6ms%rmGm0d?,RW?#FrO]WFiAGrS&]O6G3r+#B1h08jHosHY1:K9k4ZXRUHX7KJVS?rf<S,G)0VjPEqe1:,6Ri@81@d[.EuOaBX(8G;^?ULnX(tdWi>*@*5(EP0lZH1h90$7SPdq:P`uU:kXk5>udn9a?-dkXV'#t9ADR2F*jE,So8.q:9K)"[?DN3P"i50=j<o6Ehk2<ZHYhS=RhJkoEn-3+RA&EpR\kGb\0#S\hO.Gh!"Yo;f9e[lM.h$oR_OSM;E7!Yel.XO=WO>jR(G4\nD)D,]3;++R89epu.FT2d;QY@[np2NtE9FMeN:[@CrNtDFBP4]d=+RIn^F(mk?F[c#SR<<~>
+Gatn$?Z4XP'ZJu$.K%g^E,.OYlo_`,W&/Wp]B3PM[YGP*GRXs:To=Er3WEj+$gNg'"Nbe,I88)6-<F@B.>scBJsQ+W';ZO"8s7-l1>\NsBIn`+'H)TGU\j9?r<<>Q]DH'[&Y\nb[YSnWK^FPfY)uXR0LOM3I6W'TlJ/hWZ^bn,\m2i;=8nB/X4]N0M6bHu!t6rM3(D/T&^hXZ:*i5=M2ks@H@pOi0a0R^-4DSh"4mU:\8rZOVA'0,SRV^hJhssh:O8eu3qmKG6!5AI`$!5OYTm#!U6n3i8LKs,<O$\@Mop8S.e=A8[b(1eeDN#;X3+V22>!1:=Y;Fj5rPAl1==,UiX(@lL%YJ)\8@m^aUX8-#SNSmW]j%2>:)1<V\7ug2U=0OW34qO8ei:Hm:oqj5AJ-mlS^_e<I%\bNtK(]buCZ3iF)c/i$a9Q<oi;g0e&Q,Vk[b=2WA748$Rj;pUZ_Sn!#h+2S%KjF-Ih@;NQj-b)l,r(uq1\V:3+r2",b4=/`1T95p2`XtV>t];fkPPn27*g28o0TY5DrSo7tRK5J?Ja1!LU3RGTd5l0BV`fXV%.?ZTb[ttC6LsUSq?#K5dWh%p#8ju)&lLT`Wn(hr"s)<pG$l5=dfBNs[Ad.Y621)jL[MZ62;3*...=-nrq(`ZEh?+DG^P"jM@H2C3,/Q@9#tL03VsXNPY,fg`kiJgu/7ast&'Ba0.)q+EZ9F\bn<.PPLMB]TF5r6RX'Ia3CL*4`[2"BG>4&Fn/'IBMc+sSX(Z^^nHi~>
 endstream
 endobj
-59 0 obj
+57 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 58 0 R
+/Contents 56 0 R
 >>
 endobj
-61 0 obj
+59 0 obj
 <<
  /Title (\376\377\0\61\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\103\0\157\0\156\0\164\0\162\0\151\0\142)
- /Parent 60 0 R
- /First 62 0 R
- /Last 82 0 R
- /Count -21
+ /Parent 58 0 R
+ /First 60 0 R
+ /Last 79 0 R
+ /Count -20
  /A 9 0 R
 >> endobj
-62 0 obj
+60 0 obj
 <<
  /Title (\376\377\0\61\0\56\0\61\0\40\0\141\0\156\0\141\0\154\0\171\0\172\0\145\0\162\0\163)
- /Parent 61 0 R
- /Next 63 0 R
+ /Parent 59 0 R
+ /Next 61 0 R
  /A 11 0 R
 >> endobj
-63 0 obj
+61 0 obj
 <<
  /Title (\376\377\0\61\0\56\0\62\0\40\0\141\0\156\0\164)
- /Parent 61 0 R
+ /Parent 59 0 R
+ /Prev 60 0 R
+ /Next 62 0 R
+ /A 13 0 R
+>> endobj
+62 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\63\0\40\0\142\0\145\0\156\0\143\0\150\0\155\0\141\0\162\0\153)
+ /Parent 59 0 R
+ /Prev 61 0 R
+ /Next 63 0 R
+ /A 15 0 R
+>> endobj
+63 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142)
+ /Parent 59 0 R
  /Prev 62 0 R
  /Next 64 0 R
- /A 13 0 R
+ /A 17 0 R
 >> endobj
 64 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\63\0\40\0\142\0\145\0\156\0\143\0\150\0\155\0\141\0\162\0\153)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\65\0\40\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
+ /Parent 59 0 R
  /Prev 63 0 R
  /Next 65 0 R
- /A 15 0 R
+ /A 19 0 R
 >> endobj
 65 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\66\0\40\0\151\0\143\0\165)
+ /Parent 59 0 R
  /Prev 64 0 R
  /Next 66 0 R
- /A 17 0 R
+ /A 21 0 R
 >> endobj
 66 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\65\0\40\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\156\0\163\0\164\0\141\0\156\0\164\0\151\0\141\0\164\0\145\0\144)
+ /Parent 59 0 R
  /Prev 65 0 R
  /Next 67 0 R
- /A 19 0 R
+ /A 23 0 R
 >> endobj
 67 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\66\0\40\0\146\0\141\0\163\0\164\0\55\0\166\0\145\0\143\0\164\0\157\0\162\0\55\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\70\0\40\0\154\0\165\0\143\0\154\0\151)
+ /Parent 59 0 R
  /Prev 66 0 R
  /Next 68 0 R
- /A 21 0 R
+ /A 25 0 R
 >> endobj
 68 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\143\0\165)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\71\0\40\0\155\0\145\0\155\0\157\0\162\0\171)
+ /Parent 59 0 R
  /Prev 67 0 R
  /Next 69 0 R
- /A 23 0 R
+ /A 27 0 R
 >> endobj
 69 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\70\0\40\0\151\0\156\0\163\0\164\0\141\0\156\0\164\0\151\0\141\0\164\0\145\0\144)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\155\0\151\0\163\0\143)
+ /Parent 59 0 R
  /Prev 68 0 R
  /Next 70 0 R
- /A 25 0 R
+ /A 29 0 R
 >> endobj
 70 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\71\0\40\0\154\0\165\0\143\0\154\0\151)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\161\0\165\0\145\0\162\0\171\0\160\0\141\0\162\0\163\0\145\0\162)
+ /Parent 59 0 R
  /Prev 69 0 R
  /Next 71 0 R
- /A 27 0 R
+ /A 31 0 R
 >> endobj
 71 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\155\0\145\0\155\0\157\0\162\0\171)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\62\0\40\0\161\0\165\0\145\0\162\0\151\0\145\0\163)
+ /Parent 59 0 R
  /Prev 70 0 R
  /Next 72 0 R
- /A 29 0 R
+ /A 33 0 R
 >> endobj
 72 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\155\0\151\0\163\0\143)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\162\0\145\0\155\0\157\0\164\0\145)
+ /Parent 59 0 R
  /Prev 71 0 R
  /Next 73 0 R
- /A 31 0 R
+ /A 35 0 R
 >> endobj
 73 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\62\0\40\0\161\0\165\0\145\0\162\0\171\0\160\0\141\0\162\0\163\0\145\0\162)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154)
+ /Parent 59 0 R
  /Prev 72 0 R
  /Next 74 0 R
- /A 33 0 R
+ /A 37 0 R
 >> endobj
 74 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\162\0\145\0\147\0\145\0\170)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\163\0\160\0\145\0\154\0\154\0\143\0\150\0\145\0\143\0\153\0\145\0\162)
+ /Parent 59 0 R
  /Prev 73 0 R
  /Next 75 0 R
- /A 35 0 R
+ /A 39 0 R
 >> endobj
 75 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\162\0\145\0\155\0\157\0\164\0\145)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\66\0\40\0\163\0\165\0\162\0\162\0\157\0\165\0\156\0\144)
+ /Parent 59 0 R
  /Prev 74 0 R
  /Next 76 0 R
- /A 37 0 R
+ /A 41 0 R
 >> endobj
 76 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\163\0\167\0\151\0\156\0\147)
+ /Parent 59 0 R
  /Prev 75 0 R
  /Next 77 0 R
- /A 39 0 R
+ /A 43 0 R
 >> endobj
 77 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\66\0\40\0\163\0\160\0\145\0\154\0\154\0\143\0\150\0\145\0\143\0\153\0\145\0\162)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\167\0\151\0\153\0\151\0\160\0\145\0\144\0\151\0\141)
+ /Parent 59 0 R
  /Prev 76 0 R
  /Next 78 0 R
- /A 41 0 R
+ /A 45 0 R
 >> endobj
 78 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\163\0\165\0\162\0\162\0\157\0\165\0\156\0\144)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\71\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164)
+ /Parent 59 0 R
  /Prev 77 0 R
  /Next 79 0 R
- /A 43 0 R
+ /A 47 0 R
 >> endobj
 79 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\163\0\167\0\151\0\156\0\147)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\62\0\60\0\40\0\170\0\155\0\154\0\55\0\161\0\165\0\145\0\162\0\171\0\55\0\160\0\141\0\162\0\163\0\145\0\162)
+ /Parent 59 0 R
  /Prev 78 0 R
- /Next 80 0 R
- /A 45 0 R
->> endobj
-80 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\61\0\71\0\40\0\167\0\151\0\153\0\151\0\160\0\145\0\144\0\151\0\141)
- /Parent 61 0 R
- /Prev 79 0 R
- /Next 81 0 R
- /A 47 0 R
->> endobj
-81 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\62\0\60\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164)
- /Parent 61 0 R
- /Prev 80 0 R
- /Next 82 0 R
  /A 49 0 R
 >> endobj
-82 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\62\0\61\0\40\0\170\0\155\0\154\0\55\0\161\0\165\0\145\0\162\0\171\0\55\0\160\0\141\0\162\0\163\0\145\0\162)
- /Parent 61 0 R
- /Prev 81 0 R
- /A 51 0 R
->> endobj
-83 0 obj
+80 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-84 0 obj
+81 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-85 0 obj
+82 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-86 0 obj
+83 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-87 0 obj
+84 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -539,253 +520,244 @@ endobj
 1 0 obj
 << /Type /Pages
 /Count 5
-/Kids [6 0 R 53 0 R 55 0 R 57 0 R 59 0 R ] >>
+/Kids [6 0 R 51 0 R 53 0 R 55 0 R 57 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 60 0 R
+ /Outlines 58 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 83 0 R /F5 84 0 R /F1 85 0 R /F2 86 0 R /F7 87 0 R >> 
+/Font << /F3 80 0 R /F5 81 0 R /F1 82 0 R /F2 83 0 R /F7 84 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 659.0 null]
+/D [51 0 R /XYZ 85.0 659.0 null]
 >>
 endobj
 11 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 339.066 null]
+/D [51 0 R /XYZ 85.0 339.066 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 266.613 null]
+/D [51 0 R /XYZ 85.0 266.613 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 194.16 null]
+/D [51 0 R /XYZ 85.0 194.16 null]
 >>
 endobj
 17 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 637.8 null]
+/D [53 0 R /XYZ 85.0 637.8 null]
 >>
 endobj
 19 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 565.347 null]
+/D [53 0 R /XYZ 85.0 565.347 null]
 >>
 endobj
 21 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 492.894 null]
+/D [53 0 R /XYZ 85.0 492.894 null]
 >>
 endobj
 23 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 394.041 null]
+/D [53 0 R /XYZ 85.0 407.241 null]
 >>
 endobj
 25 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 308.388 null]
+/D [53 0 R /XYZ 85.0 321.588 null]
 >>
 endobj
 27 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 222.735 null]
+/D [53 0 R /XYZ 85.0 249.135 null]
 >>
 endobj
 29 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 150.282 null]
+/D [53 0 R /XYZ 85.0 176.682 null]
 >>
 endobj
 31 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 616.6 null]
+/D [55 0 R /XYZ 85.0 616.6 null]
 >>
 endobj
 33 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 530.947 null]
+/D [55 0 R /XYZ 85.0 530.947 null]
 >>
 endobj
 35 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 445.294 null]
+/D [55 0 R /XYZ 85.0 458.494 null]
 >>
 endobj
 37 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 372.841 null]
+/D [55 0 R /XYZ 85.0 386.041 null]
 >>
 endobj
 39 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 300.388 null]
+/D [55 0 R /XYZ 85.0 313.588 null]
 >>
 endobj
 41 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 227.935 null]
+/D [55 0 R /XYZ 85.0 241.135 null]
 >>
 endobj
 43 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 155.482 null]
+/D [55 0 R /XYZ 85.0 168.682 null]
 >>
 endobj
 45 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 616.6 null]
+/D [57 0 R /XYZ 85.0 637.8 null]
 >>
 endobj
 47 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 544.147 null]
+/D [57 0 R /XYZ 85.0 565.347 null]
 >>
 endobj
 49 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 471.694 null]
+/D [57 0 R /XYZ 85.0 492.894 null]
 >>
 endobj
-51 0 obj
-<<
-/S /GoTo
-/D [59 0 R /XYZ 85.0 399.241 null]
->>
-endobj
-60 0 obj
+58 0 obj
 <<
- /First 61 0 R
- /Last 61 0 R
+ /First 59 0 R
+ /Last 59 0 R
 >> endobj
 xref
-0 88
+0 85
 0000000000 65535 f 
-0000015010 00000 n 
-0000015096 00000 n 
-0000015188 00000 n 
+0000014401 00000 n 
+0000014487 00000 n 
+0000014579 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001201 00000 n 
-0000001321 00000 n 
-0000001493 00000 n 
-0000015311 00000 n 
-0000001628 00000 n 
-0000015374 00000 n 
-0000001765 00000 n 
-0000015440 00000 n 
-0000001902 00000 n 
-0000015506 00000 n 
-0000002039 00000 n 
-0000015571 00000 n 
-0000002174 00000 n 
-0000015635 00000 n 
-0000002311 00000 n 
-0000015701 00000 n 
-0000002448 00000 n 
-0000015767 00000 n 
-0000002585 00000 n 
-0000015833 00000 n 
-0000002722 00000 n 
-0000015899 00000 n 
-0000002859 00000 n 
-0000015965 00000 n 
-0000002996 00000 n 
-0000016031 00000 n 
-0000003133 00000 n 
-0000016095 00000 n 
-0000003269 00000 n 
-0000016161 00000 n 
-0000003406 00000 n 
-0000016227 00000 n 
-0000003543 00000 n 
-0000016293 00000 n 
-0000003680 00000 n 
-0000016359 00000 n 
-0000003817 00000 n 
-0000016425 00000 n 
-0000003953 00000 n 
-0000016491 00000 n 
-0000004090 00000 n 
-0000016555 00000 n 
-0000004227 00000 n 
-0000016621 00000 n 
-0000004364 00000 n 
-0000016687 00000 n 
-0000004501 00000 n 
-0000006449 00000 n 
-0000006557 00000 n 
-0000007978 00000 n 
-0000008086 00000 n 
-0000009491 00000 n 
-0000009599 00000 n 
-0000010643 00000 n 
-0000016753 00000 n 
-0000010751 00000 n 
-0000010952 00000 n 
-0000011108 00000 n 
-0000011242 00000 n 
-0000011412 00000 n 
-0000011540 00000 n 
-0000011722 00000 n 
-0000011974 00000 n 
-0000012108 00000 n 
-0000012296 00000 n 
-0000012442 00000 n 
-0000012599 00000 n 
-0000012744 00000 n 
-0000012931 00000 n 
-0000013082 00000 n 
-0000013239 00000 n 
-0000013402 00000 n 
-0000013595 00000 n 
-0000013764 00000 n 
-0000013915 00000 n 
-0000014090 00000 n 
-0000014253 00000 n 
-0000014454 00000 n 
-0000014567 00000 n 
-0000014677 00000 n 
-0000014785 00000 n 
-0000014901 00000 n 
+0000001165 00000 n 
+0000001285 00000 n 
+0000001450 00000 n 
+0000014702 00000 n 
+0000001585 00000 n 
+0000014765 00000 n 
+0000001722 00000 n 
+0000014831 00000 n 
+0000001859 00000 n 
+0000014897 00000 n 
+0000001996 00000 n 
+0000014962 00000 n 
+0000002131 00000 n 
+0000015026 00000 n 
+0000002268 00000 n 
+0000015092 00000 n 
+0000002405 00000 n 
+0000015158 00000 n 
+0000002542 00000 n 
+0000015224 00000 n 
+0000002679 00000 n 
+0000015290 00000 n 
+0000002816 00000 n 
+0000015356 00000 n 
+0000002953 00000 n 
+0000015422 00000 n 
+0000003089 00000 n 
+0000015486 00000 n 
+0000003226 00000 n 
+0000015552 00000 n 
+0000003363 00000 n 
+0000015618 00000 n 
+0000003500 00000 n 
+0000015684 00000 n 
+0000003637 00000 n 
+0000015750 00000 n 
+0000003773 00000 n 
+0000015816 00000 n 
+0000003910 00000 n 
+0000015882 00000 n 
+0000004047 00000 n 
+0000015946 00000 n 
+0000004184 00000 n 
+0000016012 00000 n 
+0000004321 00000 n 
+0000006269 00000 n 
+0000006377 00000 n 
+0000007805 00000 n 
+0000007913 00000 n 
+0000009309 00000 n 
+0000009417 00000 n 
+0000010279 00000 n 
+0000016078 00000 n 
+0000010387 00000 n 
+0000010588 00000 n 
+0000010744 00000 n 
+0000010878 00000 n 
+0000011048 00000 n 
+0000011176 00000 n 
+0000011358 00000 n 
+0000011492 00000 n 
+0000011680 00000 n 
+0000011826 00000 n 
+0000011978 00000 n 
+0000012123 00000 n 
+0000012310 00000 n 
+0000012473 00000 n 
+0000012630 00000 n 
+0000012793 00000 n 
+0000012986 00000 n 
+0000013155 00000 n 
+0000013306 00000 n 
+0000013481 00000 n 
+0000013644 00000 n 
+0000013845 00000 n 
+0000013958 00000 n 
+0000014068 00000 n 
+0000014176 00000 n 
+0000014292 00000 n 
 trailer
 <<
-/Size 88
+/Size 85
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-16804
+16129
 %%EOF

Modified: lucene/java/branches/flex_1458/docs/queryparsersyntax.html
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/queryparsersyntax.html?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/queryparsersyntax.html (original)
+++ lucene/java/branches/flex_1458/docs/queryparsersyntax.html Sat Mar 27 19:12:08 2010
@@ -153,9 +153,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -180,9 +177,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/branches/flex_1458/docs/scoring.html
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/scoring.html?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/scoring.html (original)
+++ lucene/java/branches/flex_1458/docs/scoring.html Sat Mar 27 19:12:08 2010
@@ -153,9 +153,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -180,9 +177,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/branches/flex_1458/docs/systemrequirements.html
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/docs/systemrequirements.html?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/docs/systemrequirements.html (original)
+++ lucene/java/branches/flex_1458/docs/systemrequirements.html Sat Mar 27 19:12:08 2010
@@ -151,9 +151,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -178,9 +175,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Propchange: lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:926653
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:926653,926948-928243
 /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java:909334
 /lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:916596,916685,916755,916769,917019,917148,917154,917161,917203-917204,919060,919119,919718,919731,919869,920237-920499,922013,922277,922525,922528,922583,922593,922602,922624,922797,922799,922806,922886-922887,923112,923238,924151,924207,924286,924321-924731,924781,925176-925462
 /lucene/solr/branches/newtrunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:926020-926289

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWriterConfig.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWriterConfig.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWriterConfig.java Sat Mar 27 19:12:08 2010
@@ -88,7 +88,7 @@ public final class IndexWriterConfig imp
    *  others to finish. */
   public final static int DEFAULT_MAX_THREAD_STATES = 8;
 
-  /** Default setting for {@link #setIndexWriterPooling}. */
+  /** Default setting for {@link #setReaderPooling}. */
   public final static boolean DEFAULT_READER_POOLING = false;
 
   /**

Propchange: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:926653
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:926653,926948-928243
 /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:909334
 /lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:916596,916685,916755,916769,917019,917148,917154,917161,917203-917204,919060,919119,919718,919731,919869,920237-920499,922013,922277,922525,922528,922583,922593,922602,922624,922797,922799,922806,922886-922887,923112,923238,924151,924207,924286,924321-924731,924781,925176-925462
 /lucene/solr/branches/newtrunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:926020-926289

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/Directory.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/Directory.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/Directory.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/Directory.java Sat Mar 27 19:12:08 2010
@@ -22,6 +22,14 @@ import java.io.Closeable;
 import java.util.Collection;
 import java.util.Collections;
 
+import java.util.ArrayList;
+import static java.util.Arrays.asList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.lucene.index.IndexFileNameFilter;
+import org.apache.lucene.util.IOUtils;
+
 /** A Directory is a flat list of files.  Files may be written once, when they
  * are created.  Once a file is created it may only be opened for read, or
  * deleted.  Random access is permitted both when reading and writing.
@@ -83,6 +91,9 @@ public abstract class Directory implemen
    * stable storage.  Lucene uses this to properly commit
    * changes to the index, to prevent a machine/OS crash
    * from corrupting the index.
+   * @deprecated use {@link #sync(Collection)} instead.
+   * For easy migration you can change your code to call
+   * sync(Collections.singleton(name))
    */
   @Deprecated
   public void sync(String name) throws IOException { // TODO 4.0 kill me
@@ -178,59 +189,86 @@ public abstract class Directory implemen
       return this.toString();
   }
 
+
   /**
-   * Copy contents of a directory src to a directory dest.
-   * If a file in src already exists in dest then the
-   * one in dest will be blindly overwritten.
+   * <p>Copy all files of this directory to destination directory. All conflicting files at destination are overwritten</p>
+   * <p><b>NOTE:</b> this method only copies files that look like index files (ie, have extensions matching the known
+   * extensions of index files).
+   * <p><b>NOTE:</b> the source directory should not change while this method is running.  Otherwise the results are
+   * undefined and you could easily hit a FileNotFoundException. </p>
    *
-   * <p><b>NOTE:</b> the source directory cannot change
-   * while this method is running.  Otherwise the results
-   * are undefined and you could easily hit a
-   * FileNotFoundException.
-   *
-   * <p><b>NOTE:</b> this method only copies files that look
-   * like index files (ie, have extensions matching the
-   * known extensions of index files).
-   *
-   * @param src source directory
-   * @param dest destination directory
-   * @param closeDirSrc if <code>true</code>, call {@link #close()} method on source directory
-   * @throws IOException
+   * @param to        destination directory
    */
-  public static void copy(Directory src, Directory dest, boolean closeDirSrc) throws IOException {
-    final String[] files = src.listAll();
+  // TODO / noncommit: Use codec? for filename filter
+  public final void copyTo(Directory to) throws IOException {
+    /*List<String> filenames = new ArrayList<String>();
+    IndexFileNameFilter filter = IndexFileNameFilter.getFilter();
+
+    for (String name : listAll())
+      if (filter.accept(null, name))
+        filenames.add(name);
+
+    copyTo(to, filenames);
+    */
+    copyTo(to, asList(listAll()));
+  }
 
+  /**
+   * <p>Copy given files of this directory to destination directory. All conflicting files at destination are overwritten</p>
+   * <p><b>NOTE:</b> the source directory should not change while this method is running.  Otherwise the results are
+   * undefined and you could easily hit a FileNotFoundException. </p>
+   * <p><b>NOTE:</b> implementations can check if destination directory is of the same type as 'this' and perform optimized copy</p>
+   *
+   * @param to        destination directory
+   * @param filenames file names to be copied
+   */
+  public void copyTo(Directory to, Collection<String> filenames) throws IOException {
     byte[] buf = new byte[BufferedIndexOutput.BUFFER_SIZE];
-    for (int i = 0; i < files.length; i++) {
-
+    for (String filename : filenames) {
       IndexOutput os = null;
       IndexInput is = null;
+      IOException priorException = null;
       try {
         // create file in dest directory
-        os = dest.createOutput(files[i]);
+        os = to.createOutput(filename);
         // read current file
-        is = src.openInput(files[i]);
+        is = openInput(filename);
         // and copy to dest directory
         long len = is.length();
         long readCount = 0;
         while (readCount < len) {
-          int toRead = readCount + BufferedIndexOutput.BUFFER_SIZE > len ? (int)(len - readCount) : BufferedIndexOutput.BUFFER_SIZE;
+          int toRead = readCount + BufferedIndexOutput.BUFFER_SIZE > len ? (int) (len - readCount) : BufferedIndexOutput.BUFFER_SIZE;
           is.readBytes(buf, 0, toRead);
           os.writeBytes(buf, toRead);
           readCount += toRead;
         }
+      } catch (IOException ioe) {
+        priorException = ioe;
       } finally {
-        // graceful cleanup
-        try {
-          if (os != null)
-            os.close();
-        } finally {
-          if (is != null)
-            is.close();
-        }
+        IOUtils.closeSafely(priorException, os, is);
       }
     }
-    if(closeDirSrc)
+  }
+
+  /**
+   * Copy contents of a directory src to a directory dest. If a file in src already exists in dest then the one in dest
+   * will be blindly overwritten.
+   * <p/>
+   * <p><b>NOTE:</b> the source directory cannot change while this method is running.  Otherwise the results are
+   * undefined and you could easily hit a FileNotFoundException.
+   * <p/>
+   * <p><b>NOTE:</b> this method only copies files that look like index files (ie, have extensions matching the known
+   * extensions of index files).
+   *
+   * @param src         source directory
+   * @param dest        destination directory
+   * @param closeDirSrc if <code>true</code>, call {@link #close()} method on source directory
+   * @deprecated should be replaced with src.copyTo(dest); [src.close();]
+   */
+  @Deprecated
+  public static void copy(Directory src, Directory dest, boolean closeDirSrc) throws IOException {
+    src.copyTo(dest);
+    if (closeDirSrc)
       src.close();
   }
 

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/FSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/FSDirectory.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/FSDirectory.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/FSDirectory.java Sat Mar 27 19:12:08 2010
@@ -18,9 +18,12 @@ package org.apache.lucene.store;
  */
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.nio.channels.FileChannel;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
@@ -29,6 +32,7 @@ import java.util.Collections;
 import static java.util.Collections.synchronizedSet;
 import java.util.HashSet;
 import java.util.Set;
+import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.ThreadInterruptedException;
 import org.apache.lucene.util.Constants;
 
@@ -422,6 +426,30 @@ public abstract class FSDirectory extend
     return chunkSize;
   }
 
+  @Override
+  public void copyTo(Directory to, Collection<String> filenames) throws IOException {
+    if (to instanceof FSDirectory) {
+      FSDirectory target = (FSDirectory) to;
+
+      for (String filename : filenames) {
+        target.ensureCanWrite(filename);
+        FileChannel input = null;
+        FileChannel output = null;
+        IOException priorException = null;
+        try {
+          input = new FileInputStream(new File(directory, filename)).getChannel();
+          output = new FileOutputStream(new File(target.directory, filename)).getChannel();
+          output.transferFrom(input, 0, input.size());
+        } catch (IOException ioe) {
+          priorException = ioe;
+        } finally {
+          IOUtils.closeSafely(priorException, input, output);
+        }
+      }
+    } else
+      super.copyTo(to, filenames);
+  }
+
   protected static class FSIndexOutput extends BufferedIndexOutput {
     private final FSDirectory parent;
     private final String name;

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/MMapDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/MMapDirectory.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/MMapDirectory.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/MMapDirectory.java Sat Mar 27 19:12:08 2010
@@ -34,7 +34,7 @@ import org.apache.lucene.util.Constants;
 
 /** File-based {@link Directory} implementation that uses
  *  mmap for reading, and {@link
- *  SimpleFSDirectory.SimpleFSIndexOutput} for writing.
+ *  FSDirectory.FSIndexOutput} for writing.
  *
  * <p><b>NOTE</b>: memory mapping uses up a portion of the
  * virtual memory address space in your process equal to the

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/NIOFSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/NIOFSDirectory.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/NIOFSDirectory.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/NIOFSDirectory.java Sat Mar 27 19:12:08 2010
@@ -29,7 +29,7 @@ import java.nio.channels.FileChannel;
  * synchronizing.
  *
  * <p>This class only uses FileChannel when reading; writing
- * is achieved with {@link SimpleFSDirectory.SimpleFSIndexOutput}.
+ * is achieved with {@link FSDirectory.FSIndexOutput}.
  * 
  * <p><b>NOTE</b>: NIOFSDirectory is not recommended on Windows because of a bug
  * in how FileChannel.read is implemented in Sun's JRE.

Modified: lucene/java/branches/flex_1458/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml (original)
+++ lucene/java/branches/flex_1458/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml Sat Mar 27 19:12:08 2010
@@ -74,12 +74,6 @@
                 <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>
             </section>
-            
-            <section id="fast-vector-highlighter"><title>fast-vector-highlighter</title>
-                <p>An alternative set of classes for highlighting matching terms in search results that relies on stored term vectors.
-                This highlighter can be much faster than the standard highlighter, especially on large fields.</p>
-                <p>See <a href="../api/contrib-fast-vector-highlighter/index.html">fast-vector-highlighter javadoc</a></p>
-            </section>
 
             <section id="icu"><title>icu</title>
                 <p>Provides integration with ICU (International Components for Unicode) for
@@ -112,9 +106,9 @@
                 <p>See <a href="../api/contrib-queryparser/index.html">queryparser javadoc</a></p>
             </section>                          
  
-            <section id="regex"><title>regex</title>
-                <p>Queries with additional regex matching capabilities.</p>
-                <p>See <a href="../api/contrib-regex/index.html">regex javadoc</a></p>
+            <section id="queries"><title>queries</title>
+                <p>Additional queries for Lucene.</p>
+                <p>See <a href="../api/contrib-queries/index.html">queries javadoc</a></p>
             </section> 
             
             <section id="remote"><title>remote</title>

Modified: lucene/java/branches/flex_1458/src/site/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/site/src/documentation/content/xdocs/site.xml?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/site/src/documentation/content/xdocs/site.xml (original)
+++ lucene/java/branches/flex_1458/src/site/src/documentation/content/xdocs/site.xml Sat Mar 27 19:12:08 2010
@@ -58,7 +58,6 @@ See http://forrest.apache.org/docs/linki
 		    <javadoc-contrib-bdb label="Bdb" href="ext:javadocs-contrib-bdb"/>
 		    <javadoc-contrib-bdb-je label="Bdb-je" href="ext:javadocs-contrib-bdb-je"/>
 		    <javadoc-contrib-benchmark label="Benchmark" href="ext:javadocs-contrib-benchmark"/>
-		    <javadoc-contrib-fast-vector-highlighter label="Fast Vector Highlighter" href="ext:javadocs-contrib-fast-vector-highlighter"/>
 		    <javadoc-contrib-highlighter label="Highlighter" href="ext:javadocs-contrib-highlighter"/>
 		    <javadoc-contrib-icu label="ICU" href="ext:javadocs-contrib-icu"/>
 		    <javadoc-contrib-instantiated label="Instantiated" href="ext:javadocs-contrib-instantiated"/>
@@ -67,7 +66,6 @@ See http://forrest.apache.org/docs/linki
 		    <javadoc-contrib-misc label="Miscellaneous" href="ext:javadocs-contrib-misc"/>
 		    <javadoc-contrib-queries label="Queries" href="ext:javadocs-contrib-queries"/>
                     <javadoc-contrib-queryparser label="Query Parser Framework" href="ext:javadocs-contrib-queryparser"/>
-		    <javadoc-contrib-regex label="Regex" href="ext:javadocs-contrib-regex"/>
 <!-- This package has currently no content			
 		    <javadoc-contrib-similarity label="Similarity" href="ext:javadocs-contrib-similarity"/>
 -->			
@@ -112,7 +110,6 @@ See http://forrest.apache.org/docs/linki
 	<javadocs-contrib-bdb href="api/contrib-bdb/index.html"/>
 	<javadocs-contrib-bdb-je href="api/contrib-bdb-je/index.html"/>
 	<javadocs-contrib-benchmark href="api/contrib-benchmark/index.html"/>
-	<javadocs-contrib-fast-vector-highlighter href="api/contrib-fast-vector-highlighter/index.html"/>
 	<javadocs-contrib-highlighter href="api/contrib-highlighter/index.html"/>
     <javadocs-contrib-icu href="api/contrib-icu/index.html"/>
 	<javadocs-contrib-instantiated href="api/contrib-instantiated/index.html"/>
@@ -121,7 +118,6 @@ See http://forrest.apache.org/docs/linki
 	<javadocs-contrib-misc href="api/contrib-misc/index.html"/>
 	<javadocs-contrib-queries href="api/contrib-queries/index.html"/>
         <javadocs-contrib-queryparser href="api/contrib-queryparser/index.html"/>
-	<javadocs-contrib-regex href="api/contrib-regex/index.html"/>
 	<javadocs-contrib-remote href="api/contrib-remote/index.html"/>
 	<javadocs-contrib-similarity href="api/contrib-similarity/index.html"/>
 	<javadocs-contrib-spatial href="api/contrib-spatial/index.html"/>

Propchange: lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:926653
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:926653,926948-928243
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:829134,829881,831036,896850,909334
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:880793,896906

Propchange: lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:926653
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:926653,926948-928243
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:829134,829881,831036,896850,909334
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestDateTools.java:880793,896906

Propchange: lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:926653
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:926653,926948-928243
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:829134,829881,831036,896850,909334
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestNumberTools.java:880793,896906

Modified: lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Sat Mar 27 19:12:08 2010
@@ -76,11 +76,11 @@ public class TestBackwardsCompatibility 
   }
   */
 
-  /* Unzips dirName + ".zip" --> dirName, removing dirName
+  /* Unzips zipName --> dirName, removing dirName
      first */
-  public void unzip(String zipName, String destDirName) throws IOException {
+  public void unzip(File zipName, String destDirName) throws IOException {
 
-    ZipFile zipFile = new ZipFile(zipName + ".zip");
+    ZipFile zipFile = new ZipFile(zipName);
 
     Enumeration<? extends ZipEntry> entries = zipFile.entries();
 
@@ -209,8 +209,7 @@ public class TestBackwardsCompatibility 
     Random rand = newRandom();
     
     for(int i=0;i<oldNames.length;i++) {
-      String dirName = "src/test/org/apache/lucene/index/index." + oldNames[i];
-      unzip(dirName, oldNames[i]);
+      unzip(getDataFile("index." + oldNames[i] + ".zip"), oldNames[i]);
 
       String fullPath = fullDir(oldNames[i]);
       Directory dir = FSDirectory.open(new File(fullPath));
@@ -244,8 +243,7 @@ public class TestBackwardsCompatibility 
 
   public void testSearchOldIndex() throws IOException {
     for(int i=0;i<oldNames.length;i++) {
-      String dirName = "src/test/org/apache/lucene/index/index." + oldNames[i];
-      unzip(dirName, oldNames[i]);
+      unzip(getDataFile("index." + oldNames[i] + ".zip"), oldNames[i]);
       searchIndex(oldNames[i], oldNames[i]);
       rmDir(oldNames[i]);
     }
@@ -253,8 +251,7 @@ public class TestBackwardsCompatibility 
 
   public void testIndexOldIndexNoAdds() throws IOException {
     for(int i=0;i<oldNames.length;i++) {
-      String dirName = "src/test/org/apache/lucene/index/index." + oldNames[i];
-      unzip(dirName, oldNames[i]);
+      unzip(getDataFile("index." + oldNames[i] + ".zip"), oldNames[i]);
       changeIndexNoAdds(oldNames[i]);
       rmDir(oldNames[i]);
     }
@@ -262,8 +259,7 @@ public class TestBackwardsCompatibility 
 
   public void testIndexOldIndex() throws IOException {
     for(int i=0;i<oldNames.length;i++) {
-      String dirName = "src/test/org/apache/lucene/index/index." + oldNames[i];
-      unzip(dirName, oldNames[i]);
+      unzip(getDataFile("index." + oldNames[i] + ".zip"), oldNames[i]);
       changeIndexWithAdds(oldNames[i]);
       rmDir(oldNames[i]);
     }
@@ -665,8 +661,7 @@ public class TestBackwardsCompatibility 
   // flex: test basics of TermsEnum api on non-flex index
   public void testNextIntoWrongField() throws Exception {
     for(int i=0;i<oldNames.length;i++) {
-      String dirName = "src/test/org/apache/lucene/index/index." + oldNames[i];
-      unzip(dirName, oldNames[i]);
+      unzip(getDataFile("index." + oldNames[i] + ".zip"), oldNames[i]);
       String fullPath = fullDir(oldNames[i]);
       Directory dir = FSDirectory.open(new File(fullPath));
       IndexReader r = IndexReader.open(dir);

Propchange: lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:926653
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:926653,926948-928243
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:829134,829881,831036,896850,909334
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:880793,896906

Propchange: lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:926653
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:926653,926948-928243
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:909334
 /lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:916596,916685,916755,916769,917019,917148,917154,917161,917203-917204,919060,919119,919718,919731,919869,920237-920499,922013,922277,922525,922528,922583,922593,922602,922624,922797,922799,922806,922886-922887,923112,923238,924151,924207,924286,924321-924731,924781,925176-925462
 /lucene/solr/branches/newtrunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:926020-926289



Mime
View raw message