From 13c7fc3c38ec442c55a04bad97f09b1c55c7510c Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Thu, 7 May 2015 10:35:11 +1000
Subject: [PATCH] move keystore to test config

---
 .../config/etc/{example-keystore => keystore}    | Bin
 jetty-server/src/main/config/modules/ssl.mod     |   2 +-
 jetty-server/src/test/config/etc/keystore        | Bin 0 -> 1426 bytes
 .../src/{main => test}/config/etc/keystore.pkf   |   0
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename jetty-server/src/main/config/etc/{example-keystore => keystore} (100%)
 create mode 100644 jetty-server/src/test/config/etc/keystore
 rename jetty-server/src/{main => test}/config/etc/keystore.pkf (100%)

diff --git a/jetty-server/src/main/config/etc/example-keystore b/jetty-server/src/main/config/etc/keystore
similarity index 100%
rename from jetty-server/src/main/config/etc/example-keystore
rename to jetty-server/src/main/config/etc/keystore
diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod
index 3c8c7feca48..6cd6ba98dac 100644
--- a/jetty-server/src/main/config/modules/ssl.mod
+++ b/jetty-server/src/main/config/modules/ssl.mod
@@ -12,7 +12,7 @@ etc/jetty-ssl.xml
 etc/jetty-ssl-context.xml
 
 [files]
-http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/example-keystore?id=${jetty.tag.version}|etc/keystore
+http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/test/config/etc/keystore?id=${jetty.tag.version}|etc/keystore
 
 [ini-template]
 ### TLS(SSL) Connector Configuration
diff --git a/jetty-server/src/test/config/etc/keystore b/jetty-server/src/test/config/etc/keystore
new file mode 100644
index 0000000000000000000000000000000000000000..b727bd0fb777fddb3463c81cb56963a7541f7b45
GIT binary patch
literal 1426
zcmezO_TO6u1_mY|W&~r_+{*0KN+9!5EW=$#pv*3VCZ=r$d~96WY>X_7T1<kBjI0bS
zO-zd#wG~&$%iMm`c71|$Y5$YitEL_J$ZnqF`)W$d-o2eMs`U?M6zI7t-(A`+-cpqw
zHFxi9-Rrrt%0A4!7X5I`p&hRtn0Nl1W1MMabV=o@O##>LX-9cnmv_92vyZY^nksPD
zdgGz_%YMiA%<+G`?zc{_^OTmKsam}GdFt7neK!{P|Bco8Yq|9PvTGT0HqQC!@x9l1
z+kfrLjk$U4PfrzX4>?lEY_X)NU`c_upzVKwLzZV_Z=OB7;%H;~#q=-kB7C15mGAK^
zvQDWpwV1Q=%|)J*vS+h8eD_X&KBLa;y!Ym4fd?y?u6<@yiQRcgW4YSWJ1qI-Q@4qE
za4m1Vxao>O&#^E1)!s>&+m1~AFk#ErRgE9c$R|1RHZn>ST)F2PCX`h;GftH|P3C*s
zWzB^ZGW^U2Io6G9<Cm+dn@b%$@cxkDi?0v*4*&Xhu{qw<UFz0*cKw3~R!=THb>jl>
z6zzz+mrM40Funf&SL@T49sAWnZvUNcc-}kaM`;+(`I*O}e=OTwz2vdB%C^t0KV2dN
z8|5bLIJC=m`3p1S>EdUM&gly9o_)k?62R=&u_P~(KYzPEv+V7u$GBF7Yt*targsEg
zTQzgVqnKmgxtO%H)!0fto_uWX^v1c;QdM?#toT{0*tgvCKBx=r`VraapZ2`+cgggB
z-Pvqw9={ifyv<wt>(DLz=%jkh_cpEkNBn#fQtx!K-V#22ApgPb-K(wNrdO3Et=(zk
zH%r#4Uj9|=lZlRA5;d`xvpUaban7~tb)L?vqO<o@r$c({0U_Q-$DE%pD%yDqwYKp-
ze(+{JQ~%8mo`p*G>(?31t6P_KXXUmI|NTdEW^*XD%W$kc6J6C`ZJL<Zk@PWEN6V*F
zkgcZ1#>_TRc(ux#yKj=Ue_0-Rb!XA^BcIEU<sO}THR1C69iJfyIzrFXz!I2{Cjk?3
zpFtDjcP19gPahu`@Un4gwRyCC=VfGMVP!CA>@^esCUfRc7B*q_(7f!t{PH}Q2nU7;
zJ3>UpKnkRbOIX-9zo<mPDX~()IX|zsG^ZppFWpeVKn^6!EiCR|kea6uoL^d$oT}iG
zT9%rVUyz%cS7In?APiE$EX?DTT2fM}5S&_6mRe*WC(dhNU}#`uWN2(^YGM)v<Qf_n
z8W}*jgU-E;^N~XoSVk~6_5wq-lc}+hVe40umt9-5IP9-{sGrmj5_UQxbn3f#Rhcal
zb$96Tc-UWFAhSV0y0D>s$!bwcyY3l3?6uy+&YLB9AjrXwMJ9=TVxnh^gTTRrgQDAx
z_HixoIbPSC|G?I^w5omSz6+<W?mi^z$(h6X=Z@>C2WR&Q742Af!tZ{F_B0c(^#Lh&
zza|JWF*7nSB0CQl;mkmH*$SFDWnY}}>VU(o3#<5V+huGG`Dn2??1_qdd2)==i--F?
zs#KSqOx?Wrm7jRA(!0Yuu5HVhrWZZce5Lb}5Bq8!uvR=V-JM%7`INM|?JE9h{&PR9
zPS5OYv=7|qeAeX{<0}8%Th2N96wN*x(D1*r!0!3JEkDAd&tKmoUZ_-IpH*z9SS<f#
VnWy8+Ul;a#sHi_<p_OCR1^^CaPjmnP

literal 0
HcmV?d00001

diff --git a/jetty-server/src/main/config/etc/keystore.pkf b/jetty-server/src/test/config/etc/keystore.pkf
similarity index 100%
rename from jetty-server/src/main/config/etc/keystore.pkf
rename to jetty-server/src/test/config/etc/keystore.pkf