From 98f0e9fc9256a511582bb7dfa7b6b2422fbb927c Mon Sep 17 00:00:00 2001 From: lvotypko Date: Tue, 31 Jul 2012 11:55:13 +0200 Subject: [PATCH 0001/1630] Show in view scheduled jobs --- .../hudson/views/BuildButtonColumn/column.jelly | 11 ++++++++++- war/src/main/webapp/images/24x24/clock_anime.gif | Bin 0 -> 5238 bytes war/src/main/webapp/images/32x32/clock_anime.gif | Bin 0 -> 7658 bytes 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 war/src/main/webapp/images/24x24/clock_anime.gif create mode 100644 war/src/main/webapp/images/32x32/clock_anime.gif diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly index 9296682ca1..b4d4dd05d4 100644 --- a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly +++ b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly @@ -27,9 +27,18 @@ THE SOFTWARE. - + + ${%Schedule a build} + + + ${%Schedule a build} + + diff --git a/war/src/main/webapp/images/24x24/clock_anime.gif b/war/src/main/webapp/images/24x24/clock_anime.gif new file mode 100644 index 0000000000000000000000000000000000000000..f38764e1eebfefa36cf87b86eec031369b1db593 GIT binary patch literal 5238 zcmeH~`9BkmAIBH^xciJ0iP{{IkBLf=BSnrVN<=ykYG^u003-nPJ;1T!5|^|z zZLEwRS-r5evvIb&WPd-v$@#IHQ&6C*nyb5uy9>BmU|2ghM1UxP~9v+tpf0L4! z<5{epl2ZJrRwyYWJRMPxmX2_2IGmFi@bM!$Gd=rrMm{p5Br!kIw@J~teYe15dYP=tQb>STvvyN<<`U}VI5*x z>~d;T3#)S~%d3Nl3KbPiWtHEntBNCfwHj(r4OQPNY8z@B3bXP4@q`C;^|+$%NhFME zePbPh@Tj4&rS@xOYg5kfw>#gOu=SXp?r)KpulPn>QC7bf7TYCGATZEnXjw{^6%;aXb>mBbHagK>n8PyHQb-w4$m9RriyLDeKgTW?LpNMd_0u8#Dj zl>Dl@n^Z96+1=aKK_K?@ju3kXW{Ba$zVA;d31babfSBDylsCJ@;GILJV=~r>|o?{(VFJTxpU;gURq5XGmAj|J~fHM&lOHi zOpQ%WlPMEZl;MS`lKJVX848UuO&+5S^et4AX=AkM*@YSWJgsSPp{al2`^L?pKN1vZzPEN1}D6F0(#vpZWVPdJB&1|O6&C-}GDr=BE-!V7OSYR$r zaQayDON=GzG-qUu)jz+;twYjvpy|J^k zyS1~q{%ddh*VgXN-p20U&ffOk-X3^Q@aDBUmikvLuANm;kSLK;R{UGkHynzPMU0x2-+6m#G4f-89ZPRlx5)O(LJDE6w* zL%65P+6=|JrxN5$qHBHyuPvk;;uVny4cRc`mOzCvjWd~|a#7Gsc>n3zf{?gN&Ykb` zt|tqJ^3iyh_Rtx+xqw9J{khpxCd5`mN`iI1e90WDAiCpag(y^(60xDq=rvzSva8*h zEdo=nBzgPtVw}9dlL;~gis&#a1Zdw1 z;Nlhv0dOBu?b8#~gD1ruQL`XAirw;6rE%HHAfNE68(e9>%4PDRLnM;A(hb%(gz5`I zC?PQ5bKS&YJqTh7Xhm4P=%Rn%z`tW&-^Yx;4}#p2O5Vo|ZaM=5yE$CFWr~aV@U^Z0 zKPxCEeF4Ex^#6?+`mVr7zW9E*9>}k*-dF*6_!8lcJp8=zQSFz@#^r&ZU}8A$M~FJ8 zLVAHtavzk&4DX54&rr(1;h+UMO*wCoeXq3maJxi;=~Hfop7_kI>3=imz< zZ||SL->m&nj0-bq9@t-Zw;S#v2^PrKdb19eV{(+ z@5dY{&}&GUHfgfXikVt&h&}Ek_lJbmaET|-D0%G=4$`N!FJ$N(cVR;7F~zKMqkkNQ zxH=)Azs`OaJhL;E=L5R%O$ ze5Q`l8YjnkjF*T)Z?vB@F%Ha2Qbfk{NWP7)h}VMwecB=0Nj@?0Z_!iX;?K}mjM8aT z^?30V4TEH#9sV&3y?=-NYacQ&3u5@*zxlV9b;5whmecSk2i$}AXK%I05o3?*K5w!W zLx_BWcrK@S!00_GMiu`=SZcLX4jc2)dlZu9iQMY1TUs#&kpE5)Qt=*T6JX-QH zC?`vc9w9`m2O@nT>z{x@tRC`tdu*ax<{BinbSQGk!Cv zaWnm5xK}f+Ika_4bD^F7Zcv!FH$dAhl`+^%k9P;lswPQmyyQ_tN_UuvcKX2r zeT2lGxAZ@fk1($e(}j;+&0L|#B!wAw{6jQ5YpOQj;vy&})%JbBH8~1@ zT|K8t#8j>Q$YE2EklPgA#BYiVEZ;`)wsp9tccAr+RL~SYR%TPyNkzU*wCkjkOLK0@ zy`5!a<#uJcK4oIq+1Sf$vz*7u2#smJQ;1-$Q`&yQR6dnM*ZeYG`&|$N{(q?G6Y6#~ z#Y6j0r!WtI;IYtaL~C3G$^T#x-!pOLn`yc=jfxhs25u~7LCoDUY4!Mw&<8?>!q%!m z6BW*{{1>y#y|7X*xZ2TK?e^;xd6xMqnS@uXOrqe?(}(qKfb;cZq$<1Gd<(nKFm-gM zk=OdPuw=@)@d4B=jAo~=xjp&;7V9V~f8!pe_V%3fJA#Q#bG|vXO5A0*{LJmfkRrEgSf4#Hs|G+WU3ox+|1!5nGKhqbfMLO zVHcDz{wx$6Q$2oI=|wHFxwxalL~1m(rSK&a=!D{!||$|GnMU$qJ76 z>(x2p8b01e2|T5bTEAT`^lAY4WWJ{G!1>Q_{epLe3eDc`QAfV?k@994+&-eSwK;7H z>$#uPb*}i9u`uX^2Gb7e0>$z@udwk#~mGC1+)N)#L71If9@` z5+>1&SPl5);T;ZArBCm$Y4m$3+t0G)2E4sjxpYn=J4}8?HL~k#zwH3+H1(e53bGMsM@wf z);LTs%l+mc2=%vw5S9#mz2LG(#q$K1WHQ;bko^5MH>sCy=^+5EE~#DgQGGiJ7dc!4 zVVZj)o+qy|0}8KsR7A@^&X3LLGHM$q zl?2#NRAY3u?&}>srTdC(BrbAGLW!F1nXMnQ#i4a6mV?{g2yVM}*Tzlh!sLG?n`!nr z>PGO|`u~VrlD`tUYwRzEQk%xYxR*M@TrHiig-WgqOC$cCB;*+Tef)u_oa=wRo_myv z@_j^10eut5-RS?vq>QJWd@lOTXWLj!OOo9faI!PO#D{G6PeRW1CfVe79tDKCM_5@a zm6EiIqM1@n@#&&bPWkOtf$i$>!ja`iX%F3>@YrfP55$IF^du>Fe=k9NHYW%kv{*=}5-{tm)U2gyVTz}TjrS(6T{8{S& literal 0 HcmV?d00001 diff --git a/war/src/main/webapp/images/32x32/clock_anime.gif b/war/src/main/webapp/images/32x32/clock_anime.gif new file mode 100644 index 0000000000000000000000000000000000000000..ac739551b56600950c649afa691c8d64bcc95b7f GIT binary patch literal 7658 zcmeI$S2!E|-v;p5qtvca)M!z))vVgPYDU$pk=kuzR%<-=o}o6SMuQj;dzB=bAPprp z6?=smrKsxrJkRm}`X9ar@7wd=;r;nt_xIK})KgM+<_GWtHhu#DWB_&!HVH{_LrozA zLw)NV4+^mZ1oGeIges)o8VP3UMCtE>Ler`c)UP(6e-ShXw(6W+-yvn$D z?^=t?8bjJO+y+=ntBR`LBPy!OKUS;Ne8{V=Y^{K{L2Ce$2E1u4X~2rUdJ*- zYHe+QLmj*U*3;YQR|BuAZ>$R*;ZH`};ag;y8v1hjU0NDCYg;SZ;XN(Qu&$P}yiY!D z%>!9OwsE6+Ep5$REq#c#Pt6_Ogl^-`u7S?p2FRFGdpEADrxV*#(u!>C>BaW-B8v$i z=;y>SWEk?}Xys^hU;i))*-<$CbZ)?XU|?hbgGP*{VKKePVZ_v6QWw4!HS`gUoyK6t z8YeTq4!<5BE^e8~!wupGhX@!v3bv4d$BkAmy<8fJ?wv0BJc9d-pKhPenEz6|JeD#r z)i^df(M*IOmgC092JwWUFJtqw;~(3W-;NQ!j85Ttmva`Us;4Gqy4Nx{rt@&~$jRx6 zPs_Da)62^do;m{hmAGP}IIySTbOLF!&x*;rhk8{2D}-<()kTPCdy zO_7H7HhR}KR=<*lH@4On_Qq!qklWj{`&)#a&E4ZI?ALwlw;k-}_Qvww-1^?cHfd{@ zw6c2eWp8JH^V{ml?%4kB;l|Cy4w$uVi~bp7P}>Dlr6!4J~$kE5SIHjmD~{Wv>0KifY) zy*NJqb@uc0{Nn8Auk+K(-xt4s{{H=2;P(|1U7)45rkSp+q%;K?000oUWYP9}<{a=0 z#Q(}Oz=L1k@R1on;Ea-t9`G9={`Z5w)<^w1rM^oPCr*oN;Zn~YssT@Ol5b1)7p%>9b z&x<5ied2MvIw+{;W!+>I)a{c1XhycC%e6s+1wfoKDlVJBnQZkwvPN2hIvQu0RrFkr zNHW$VY^IQGHcoi1>lxCPnaP*dJQ8W5BokpA_6FToYyEs%*duZ6TTvQI)*Y}Mdo`a+GLBHTcr zb+_vqs0k(;32q{x02HD?BE_5Ix3@6>=EqA5f7QYuxGVI)(G2RL;D`v$TH=J05)CYh zk?i}~HNk`+&}Jqzke`f>N-a2Z%Jms<#AgLcrAk4rAef7T{!jY|9cr#-I1N?yXnZ*t zIWtic1l?sNN-Beb4KnowJ&}Bh!K1uk@&F=A5~%WQO>79us!74d?r{qeunjPzl~m=3 zAp1Q??&L*QAEiOLw_C268z5*nz{h!=IU=^V(rrzWgD*t(m09FIkH$T-+-Z{4_AG`d6AM;#JHH*`yrtTKCYh?X4u zMka$gt_Xl?CRhxA5*G*t$B9Qy&T7Q@I<}9I zaSSf|j&T&FfGia*o3BEiyo#w6g0p^>U@KV`lj!!G;YH8f`(1<-YOxz-r!cZD0Jp z9E!n?(pf*`yqF`2>bjG30;pdz&{)Y8#;l{QSFsX9o6J*g9kZJOW>Do_ z=Hn7b;BVb`!U%@w23?~g585XrXT$uAMeYQkN0_77H3#mL?t>qOtEKU4(wG?M*vjL1 zEK|AV6wn|RkXOGEw@E_oA~*H4d1{WS?`vZf{504m$`xWL%+vbhZ+Q$U8D(-yO69h> zm;@(OsKWLZlpn?*Lr!sn`U7|F1kX_ktr#5vTK>jDfL>G%JLXt6fvxr|=6i!4`EUu+ z6Yyqf@`_|AaI7k*uEG%dw?ZGjV5Q!PC)lPYzaeBxmqTdtF&(S@A5j?8K!4q#PNH@K6Pd zwy(}~MilM69Xop_8D{t=K_gx{=DuhAQMfyg_e1pkr-lEM3;G2%7SLi(a@qi^$`JRxR{uo=g;56djv zYs*v*h5E(wV`+ur?~!^oW0_3%;nzLZSKUoSSPnN=cwdRirV57wF^(caF)nzBvHVP` zDiJE9$MfshV6EW2w57rAM{wdm7?H?n8@^zFkf-5QZ@6|7VT_9B6jyp;=kcguyj0HG z1HB>s>Ox?v;xAf@lnlIh{5xeAg(q%_=@w$!H)}zK$=m;Yc6l-x+M3-_|k_ z3+3@&sew5z&0ptiwX_nL@#~ThU!g@|Bp%fjyp!_<%INXB#`rO0lEZf-g-5|C{p(Mm z&WYl99*QweD1Aa;(^I>x6S=v!3wRYE^dj=2lchh&tEEiFpS z=PS>)M&>sL8&^?U`F*}O&c0k~X&MU|wnzmU}R|E6DA`}Pi}l;g+n9 zmmmskun5|whLoxSxh#hu6L(jnZJ;Wtv!bOs8nClKnig$J*WNOe2H5*v8)Gqv7; zlbYr3kl7N?tjS03tV7nr1Gi(m2$-~naKrJ9-5EvSWmx`CuZDUAT=b?3Z1y<6EqJ+? zu65(>o~nBeRv{%J$=WsyT|jn?^!dgTGH~YePmVk8{VC8lpT~bNGRY0iHakpOx5>Ag z=jg$CrmtJIgq~l_*s%{4wt9SdjHoYUzaf-Hu{3DZVRG|DLz$#*$O)-L9d`n$r@(lS zG~7SxT^`$pEi6i?eo0vv{?Xm?Ab3Y*z->dyQrMQQ70J^BuD(v~ZEzbd`~Kp6SQ{5nKSm$T&Z-rpghOhhsR zw4OqY#B6ZNZKU_voXPDpBO&{^=rxu2;Ej=Z=SeOX(d1xfC-3K-%BGP-9v6s4z$BO3 z-8E1aoze{5mRsab-?(9X%-D4|@w}3#E%8I84!mmVCEb=(RFJHh=#*2jc(SS}PMF}n2Qn`2@ zPP&*Aoxm%I5tT07eI=uE_KN+;ak{#49a&>V75eYb+xwwHrlOc2!DKmNfEN?SFlO|BXyTe#*<`z~U_B~Xj2F&OqY83umKy^KF)HX4ju$miRWn$G1S)U* z*O2q8hwe|pqvIR?3Hcd(j{0h`ZZfg;c{B~Y{A1!iv5X?uTu2u(O?sWu&cbI1*_?*k z<+9w+O}hJQZBB`Gp*!^KWM;h0^j**EIUl#xsmw(^2q|GKS^s6pgYYM@O(-{iJIn{Q zvxVeW4X_E=&oSgm(zvrR#CkBNxQpqoZJ76S1&}g?_hazh`dG`b)N{2kyR2&|9gM|l za142FrGA6tZ1d0k+Y42GPAkuk8qeo)VRJpz2jWkK=|}QEMV>mU3C~N|bkF^~n0fRN z_*Bi^o+il$X4|Ijj{&oNDzdpb7kXJ^HQZhgby&C{@y_kFNxOyV^j~(om`;7F=zjFQ zm?KqwW(5@Zapd945qZpu!_}Fc))xGL+)yvMPD7rbnw!B0QCkFYYjcJ&Ao;=?~bHUA--)^ISR1 ztD~yZ-mL@2CvsY^d9x`@+*5cO`+DyTsv3!R#U}}SqB+3p-`$zgDDy2xs&8Hk+*aMm zi@s|&)8sl~mT(nhl3&b4`L+6_PtNrIQJ?lVAEtwiFE2b3TP^Wt%TV#myeG-0jf*--j8ZN@sIMzBjs8rRGT#iOn;^^uvCs1>(+ihiL8f?S+YS7I-|_MO{{Xwv)&2kg literal 0 HcmV?d00001 -- GitLab From ff612d29c0189bc7a4ba78d86d36a8e6f8d1b4fd Mon Sep 17 00:00:00 2001 From: lvotypko Date: Tue, 31 Jul 2012 16:39:59 +0200 Subject: [PATCH 0002/1630] Add clock_anime.git into folder 16x16 too --- war/src/main/webapp/images/16x16/clock_anime.gif | Bin 0 -> 3232 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 war/src/main/webapp/images/16x16/clock_anime.gif diff --git a/war/src/main/webapp/images/16x16/clock_anime.gif b/war/src/main/webapp/images/16x16/clock_anime.gif new file mode 100644 index 0000000000000000000000000000000000000000..e5b9d626d0560a3f9998928fb05afc15bc2ea306 GIT binary patch literal 3232 zcmeI!`9Bkk9{})?Z=r)sDT=jZ9m3TTFp@`(#gD1zA9FK>DvZ0*0#@sn( zt_YiZi`m*3+Z;Pxv$?j(T;<`>_hGR9y{rX&YEX@s#+~fiB0NxJ33+(9! zj`IH<66hBd9FX*9aAHVkbYxVxb)MwwmkH39sdo#dp)olzZ;Bugc>ddKiAjn1$>wQ^ zCFx07?-TQ5Gec9~!Lw7soNMHB(%|0J+Ue<)Pa37NGLgC2a9CD_R~sN3)(nHyN7Y&+ zRD|ajN=s2G9|H>N z5)l=x?bYtpRW)r$Zv?U`grHiBXv=GktwuJ-^{X}2!pa(Rpx6hE$kvA1u7;28O%0fq zhW0lkJm5XlaN1?G5eQ)vxtvk?N zZS8%nT}|B`4X6$xrVWSePe)@A;}{oACmGw_+l}dh(Jj%q3Ups%`EW$ZxY_XMHyA7l zj~S?@`J=ylXdxAL;~OZrR00lN!g9g&5BC%LswOO0U!sZlfnLIR6U(NV;X2q)Z5_?% zpnhl`PbQK^$)sW8;1@J26i4Zv9FC@vF}TYTJM@feJFAd9#Nbf!@uMx& z;gJTO|1g!zqE(=IK7(W3%#m6Ol|4cu_DrRc#``dn@G%;lHcF+9Oc0qEJiDWvAI~1c zj?nR+=bq#E5gZ1J&nTubhlsq`&kG?;I-AZMn`V8YGq|MLswH;806&{Lg_&SYaoGeG zhcUq!S(reQd94)QN9t@Rn=?1Y?PX4l^$Xu~CfU5H?qLCxGd(;#!KHJD$L8xOqBM%I zj5EvN&k_V&0&iw+VvamBJ1ye1&d-i6aA){D_B?NqCB*UOxGVu>c>yyi91zXZ_=^mt zxPEa?FePBjE%0ZTre+rf!lj{!)vgsGQ7jk}E-f#LI4etwLLqlaxH!K&yCR(6iKz=> zhWIOOMYJmXDp>lu`c=IAP0ZO4bJtcE*Tfs*^_B1I{LKyF`sUi|_rJC_w>P&owzqb+ zcD`@#hMk?$I|m=!wtINf%=-4_i+cMc006-0?V~q?yxd-Rd8&u`yzo}PV|m{iaC%cp zLKd(C0PQC1PL4bPAiWLvOGa@62R(S=meOHozEw_=yoz&VAh{^cAU^mOQAtB)0OVw= zq(7!#4~HrhFXs4q4zN)7k1O+m{1R-rbfCgf-#`56Dv}qa{6&)ktT(5g4Wp(FNRMO> zY(F#X4m$F*>1n}>C(srs+O(ZRTy#KX}}&jGOz zIZoE8?0J+4ZYf#%rC+(XqkWxkg2LUw8v0qYylkKi0U3L(=2lS+ubeg4J(wf|1R*11 z5X^P z3_!*9PBOW-%`{&aUiRGg9~ncw>B?{YDW{EJICwt3(G#a=Oqc33I#*v{;FN!+3bsFh z)BS2Mkmdh_AdhL7!<%+N>QppL!?(9&fZ!w7;|be(B_TSwMqy2w$)_rSj+R2mjC zm(}MBz%Lpp1-wT&+I(G9IRn3i3`(Muo7hyQ3WffCf)l zTA?T2;nboF$rf421O=TiUTa9PU${&e<&C}$klTs(03J53Tho{ z?5aL~u6%eSe%fhnD(fPvJ%XZi$yPJf^@8IHrWXha;B!Ju4HeBXc=C3HJ!Ud&fluf%_&=bAZ&|H8NAK1&yJBiR}=PtaWbM!JRuAI z^t8ywV?m374R};w8XL5H600MyHQyd)lj3}Ss*8Z)YbDV4hRSdmfrs-PpqCaTR_8%Ju?-lzA^53hX+Qef~ic$tM3ZBJ$O=r zQl3D$C0Mkkb4YqG1NILCi-3FsziIxifv#(lH$h#N@&TlFGeV9<%Gm8~BNw!y?97S# zjE?ZNnWZO=Ryp-C@(ZUkPUx};nPMj&VC8e>uihLCiwV)CfAPUY%D!Iv!nz+h?X$J+hp%9**GC&$;nLn>Q Date: Tue, 25 Sep 2012 10:25:01 -0600 Subject: [PATCH 0003/1630] Test result page keeps identifying tests as age 1 If a test has not been viewed, the age will keep being 1. This is because getFailedSince()/failedSince is lazy loaded. Without having viewed the CaseResult that method is never called and the prev.failedSince returns '0' which may or may not be accurate. http://jenkins.361315.n4.nabble.com/Problem-with-Age-column-on-Test-Results-tab-td3172208.html --- core/src/main/java/hudson/tasks/junit/CaseResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/tasks/junit/CaseResult.java b/core/src/main/java/hudson/tasks/junit/CaseResult.java index f1d59c997c..b0a9bcbbfc 100644 --- a/core/src/main/java/hudson/tasks/junit/CaseResult.java +++ b/core/src/main/java/hudson/tasks/junit/CaseResult.java @@ -299,7 +299,7 @@ public final class CaseResult extends TestResult implements Comparable Date: Tue, 13 Nov 2012 07:42:27 +0100 Subject: [PATCH 0004/1630] Add expand all funkcionality for artifact tree view --- core/src/main/resources/lib/hudson/artifactList.jelly | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/main/resources/lib/hudson/artifactList.jelly b/core/src/main/resources/lib/hudson/artifactList.jelly index c38dd581a2..d18f44739b 100644 --- a/core/src/main/resources/lib/hudson/artifactList.jelly +++ b/core/src/main/resources/lib/hudson/artifactList.jelly @@ -74,7 +74,13 @@ THE SOFTWARE. +
+ Expand all -

${%All Failed Tests}

@@ -57,21 +35,7 @@ THE SOFTWARE. - - + diff --git a/core/src/main/resources/lib/hudson/aggregated-failed-tests.jelly b/core/src/main/resources/lib/hudson/aggregated-failed-tests.jelly new file mode 100644 index 0000000000..53573ed40f --- /dev/null +++ b/core/src/main/resources/lib/hudson/aggregated-failed-tests.jelly @@ -0,0 +1,64 @@ + + + + + + Display links to failed test from all child reports. + @since TODO + + Aggregated action. + + + + +
+

Failed Tests

+ + + + +

+ + ${report.child.project.name} +

+ +
- >>> - - - - - - - - ${f.durationString}
+ + + + + + + + + + + + +
Test NameDurationAge
${f.duration}${f.age}
+ + + + diff --git a/core/src/main/resources/lib/hudson/failed-test.jelly b/core/src/main/resources/lib/hudson/failed-test.jelly new file mode 100644 index 0000000000..889ed5b3bb --- /dev/null +++ b/core/src/main/resources/lib/hudson/failed-test.jelly @@ -0,0 +1,70 @@ + + + + + + Display link to the failed test. + @since TODO + + Path to the failed test. + + + Failed test object + + + + + + + + + >>> + + + + + + + + -- GitLab From 968acad7013d6bf8019c3913a87cdfd8d5cd5fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= Date: Wed, 2 Oct 2013 13:07:32 +0200 Subject: [PATCH 0086/1630] [JENKINS-19884] Use +/- icon instead of >>> and <<< to show and hide test failure summary --- core/src/main/resources/lib/hudson/failed-test.jelly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/lib/hudson/failed-test.jelly b/core/src/main/resources/lib/hudson/failed-test.jelly index 889ed5b3bb..2e71d4f05e 100644 --- a/core/src/main/resources/lib/hudson/failed-test.jelly +++ b/core/src/main/resources/lib/hudson/failed-test.jelly @@ -59,8 +59,8 @@ THE SOFTWARE. - >>> - + + -- GitLab From 0460a04f1cafe580d7fd8dff79b28d1cd440346a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= Date: Wed, 2 Oct 2013 13:40:09 +0200 Subject: [PATCH 0087/1630] [FIXED JENKINS-19884] Visualize more information in test failure summary Now lists error details, stack trace, stderr and stdout provided its content is not empty. --- .../tasks/junit/CaseResult/summary.jelly | 47 +++++++++++----- .../resources/lib/hudson/failed-test.jelly | 53 +++++++++++++++---- 2 files changed, 75 insertions(+), 25 deletions(-) diff --git a/core/src/main/resources/hudson/tasks/junit/CaseResult/summary.jelly b/core/src/main/resources/hudson/tasks/junit/CaseResult/summary.jelly index 6ec077da39..32bd19575e 100644 --- a/core/src/main/resources/hudson/tasks/junit/CaseResult/summary.jelly +++ b/core/src/main/resources/hudson/tasks/junit/CaseResult/summary.jelly @@ -24,19 +24,38 @@ THE SOFTWARE. - + + + + + + + + + +

+ + ${title} + + + ${title} + +

+ 
+          
+
+ + + - - -

${%Error Details}

-
- - - -

${%Stack Trace}

-
- - - + + + ${h.initPageVariables(context)} + + + + + + + diff --git a/core/src/main/resources/lib/hudson/failed-test.jelly b/core/src/main/resources/lib/hudson/failed-test.jelly index 2e71d4f05e..f043da103c 100644 --- a/core/src/main/resources/lib/hudson/failed-test.jelly +++ b/core/src/main/resources/lib/hudson/failed-test.jelly @@ -37,34 +37,65 @@ THE SOFTWARE. + - - - - + + + + + + - + -- GitLab From 8deb42bf89b0ced99a1ef5a9721986b35deda244 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 4 Oct 2013 11:16:55 -0400 Subject: [PATCH 0088/1630] [JENKINS-19473] Removing workaround since root bug should be fixed in jzlib 1.1.3. --- core/pom.xml | 6 ++++++ core/src/main/java/hudson/FilePath.java | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 1efb969184..e844111324 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -583,6 +583,12 @@ THE SOFTWARE. com.google.guava guava + + + com.jcraft + jzlib + 1.1.3 + diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index fe7d95c286..f5e3f18ba7 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -635,12 +635,7 @@ public final class FilePath implements Serializable { } } public OutputStream compress(OutputStream out) throws IOException { - return new GZIPOutputStream(new BufferedOutputStream(out), - // TODO JENKINS-19473 workaround; replace when jzlib fixed - new com.jcraft.jzlib.Deflater(6, 15+16, 9), // use 9 for memLevel - 512, - true - ); + return new GZIPOutputStream(new BufferedOutputStream(out)); } }; -- GitLab From facfc178dfecb17decfc757a186d2888a79ea684 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 4 Oct 2013 12:50:28 -0400 Subject: [PATCH 0089/1630] Moving hudson.maven tests to maven-plugin. --- test/pom.xml | 6 - .../hudson/maven/AbortedMavenBuildTest.java | 35 - .../maven/AbstractMaven3xBuildTest.java | 263 -------- .../java/hudson/maven/Maven30xBuildTest.java | 55 -- .../java/hudson/maven/Maven31xBuildTest.java | 54 -- .../maven/MavenArgumentInterceptorTest.java | 171 ----- .../maven/MavenBuildSurefireFailedTest.java | 85 --- .../java/hudson/maven/MavenBuildTest.java | 204 ------ .../hudson/maven/MavenEmptyModuleTest.java | 38 -- ...avenEnvironmentContributingActionTest.java | 143 ---- .../java/hudson/maven/MavenJellyTest.java | 40 -- .../java/hudson/maven/MavenModuleSetTest.java | 32 - ...ltiModuleLogRotatorCleanArtifactsTest.java | 109 --- .../hudson/maven/MavenMultiModuleTest.java | 622 ------------------ .../MavenMultiModuleTestIncremental.java | 70 -- .../test/java/hudson/maven/MavenOptsTest.java | 127 ---- .../java/hudson/maven/MavenProjectTest.java | 242 ------- .../maven/MavenSnapshotTriggerTest.java | 75 --- .../hudson/maven/ModuleDependencyLocator.java | 83 --- .../maven/PlexusModuleContributorTest.java | 73 -- .../hudson/maven/RedeployPublisherTest.java | 256 ------- .../hudson/maven/ResultExposingBuilder.java | 52 -- .../maven/reporters/MavenMailerTest.java | 96 --- .../reporters/MavenSiteArchiverTest.java | 16 - .../maven/reporters/SurefireArchiverTest.java | 62 -- .../resources/hudson/maven/HUDSON-4192.zip | Bin 2117 -> 0 bytes .../resources/hudson/maven/JENKINS-1557.zip | Bin 3420 -> 0 bytes .../resources/hudson/maven/JENKINS-15865.zip | Bin 2086 -> 0 bytes .../resources/hudson/maven/JENKINS-8573.zip | Bin 3739 -> 0 bytes .../resources/hudson/maven/JENKINS-9326.zip | Bin 12849 -> 0 bytes .../resources/hudson/maven/big-artifact.pom | 67 -- .../hudson/maven/custom-plexus-component.pom | 34 - .../hudson/maven/envars-maven-project.zip | Bin 3374 -> 0 bytes .../hudson/maven/foobar_eclipse_with_fix.zip | Bin 10089 -> 0 bytes .../maven/incorrect-inheritence-testcase.zip | Bin 1004 -> 0 bytes .../maven/maven-compilation-failure.zip | Bin 2160 -> 0 bytes .../hudson/maven/maven-dep-test-A-changed.zip | Bin 2597 -> 0 bytes .../hudson/maven/maven-dep-test-A.zip | Bin 2593 -> 0 bytes .../hudson/maven/maven-dep-test-B.zip | Bin 2606 -> 0 bytes .../hudson/maven/maven-dep-test-C.zip | Bin 2610 -> 0 bytes .../hudson/maven/maven-empty-mod.zip | Bin 1465 -> 0 bytes .../hudson/maven/maven-multimod-changes.zip | Bin 1063 -> 0 bytes .../hudson/maven/maven-multimod-incr.zip | Bin 10295 -> 0 bytes .../hudson/maven/maven-multimod-rel-base.zip | Bin 8620 -> 0 bytes .../resources/hudson/maven/maven-multimod.zip | Bin 8707 -> 0 bytes .../hudson/maven/maven-multimodule-site.zip | Bin 1678 -> 0 bytes .../maven/maven-multimodule-unit-failure.zip | Bin 7771 -> 0 bytes .../hudson/maven/maven-opts-echo.zip | Bin 623 -> 0 bytes .../hudson/maven/maven-surefire-unstable.zip | Bin 2459 -> 0 bytes .../maven/maven-test-failure-findbugs.zip | Bin 2289 -> 0 bytes .../resources/hudson/maven/maven3-project.zip | Bin 12960 -> 0 bytes .../hudson/maven/multimodule-maven.zip | Bin 5639 -> 0 bytes .../maven/several-modules-in-directory.zip | Bin 870 -> 0 bytes .../resources/hudson/maven/targz-artifact.pom | 54 -- .../resources/hudson/maven/test-pom-7162.xml | 26 - .../resources/hudson/maven/test-pom-8395.xml | 25 - 56 files changed, 3215 deletions(-) delete mode 100644 test/src/test/java/hudson/maven/AbortedMavenBuildTest.java delete mode 100755 test/src/test/java/hudson/maven/AbstractMaven3xBuildTest.java delete mode 100755 test/src/test/java/hudson/maven/Maven30xBuildTest.java delete mode 100755 test/src/test/java/hudson/maven/Maven31xBuildTest.java delete mode 100644 test/src/test/java/hudson/maven/MavenArgumentInterceptorTest.java delete mode 100755 test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java delete mode 100755 test/src/test/java/hudson/maven/MavenBuildTest.java delete mode 100644 test/src/test/java/hudson/maven/MavenEmptyModuleTest.java delete mode 100644 test/src/test/java/hudson/maven/MavenEnvironmentContributingActionTest.java delete mode 100644 test/src/test/java/hudson/maven/MavenJellyTest.java delete mode 100644 test/src/test/java/hudson/maven/MavenModuleSetTest.java delete mode 100644 test/src/test/java/hudson/maven/MavenMultiModuleLogRotatorCleanArtifactsTest.java delete mode 100644 test/src/test/java/hudson/maven/MavenMultiModuleTest.java delete mode 100755 test/src/test/java/hudson/maven/MavenMultiModuleTestIncremental.java delete mode 100644 test/src/test/java/hudson/maven/MavenOptsTest.java delete mode 100644 test/src/test/java/hudson/maven/MavenProjectTest.java delete mode 100644 test/src/test/java/hudson/maven/MavenSnapshotTriggerTest.java delete mode 100644 test/src/test/java/hudson/maven/ModuleDependencyLocator.java delete mode 100644 test/src/test/java/hudson/maven/PlexusModuleContributorTest.java delete mode 100644 test/src/test/java/hudson/maven/RedeployPublisherTest.java delete mode 100644 test/src/test/java/hudson/maven/ResultExposingBuilder.java delete mode 100644 test/src/test/java/hudson/maven/reporters/MavenMailerTest.java delete mode 100644 test/src/test/java/hudson/maven/reporters/MavenSiteArchiverTest.java delete mode 100644 test/src/test/java/hudson/maven/reporters/SurefireArchiverTest.java delete mode 100644 test/src/test/resources/hudson/maven/HUDSON-4192.zip delete mode 100644 test/src/test/resources/hudson/maven/JENKINS-1557.zip delete mode 100644 test/src/test/resources/hudson/maven/JENKINS-15865.zip delete mode 100644 test/src/test/resources/hudson/maven/JENKINS-8573.zip delete mode 100644 test/src/test/resources/hudson/maven/JENKINS-9326.zip delete mode 100644 test/src/test/resources/hudson/maven/big-artifact.pom delete mode 100644 test/src/test/resources/hudson/maven/custom-plexus-component.pom delete mode 100644 test/src/test/resources/hudson/maven/envars-maven-project.zip delete mode 100644 test/src/test/resources/hudson/maven/foobar_eclipse_with_fix.zip delete mode 100755 test/src/test/resources/hudson/maven/incorrect-inheritence-testcase.zip delete mode 100644 test/src/test/resources/hudson/maven/maven-compilation-failure.zip delete mode 100644 test/src/test/resources/hudson/maven/maven-dep-test-A-changed.zip delete mode 100755 test/src/test/resources/hudson/maven/maven-dep-test-A.zip delete mode 100755 test/src/test/resources/hudson/maven/maven-dep-test-B.zip delete mode 100755 test/src/test/resources/hudson/maven/maven-dep-test-C.zip delete mode 100644 test/src/test/resources/hudson/maven/maven-empty-mod.zip delete mode 100644 test/src/test/resources/hudson/maven/maven-multimod-changes.zip delete mode 100644 test/src/test/resources/hudson/maven/maven-multimod-incr.zip delete mode 100644 test/src/test/resources/hudson/maven/maven-multimod-rel-base.zip delete mode 100644 test/src/test/resources/hudson/maven/maven-multimod.zip delete mode 100644 test/src/test/resources/hudson/maven/maven-multimodule-site.zip delete mode 100755 test/src/test/resources/hudson/maven/maven-multimodule-unit-failure.zip delete mode 100644 test/src/test/resources/hudson/maven/maven-opts-echo.zip delete mode 100644 test/src/test/resources/hudson/maven/maven-surefire-unstable.zip delete mode 100755 test/src/test/resources/hudson/maven/maven-test-failure-findbugs.zip delete mode 100644 test/src/test/resources/hudson/maven/maven3-project.zip delete mode 100644 test/src/test/resources/hudson/maven/multimodule-maven.zip delete mode 100644 test/src/test/resources/hudson/maven/several-modules-in-directory.zip delete mode 100644 test/src/test/resources/hudson/maven/targz-artifact.pom delete mode 100644 test/src/test/resources/hudson/maven/test-pom-7162.xml delete mode 100755 test/src/test/resources/hudson/maven/test-pom-8395.xml diff --git a/test/pom.xml b/test/pom.xml index 015a6d99a5..790ad4ae6a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -161,12 +161,6 @@ THE SOFTWARE. geb-implicit-assertions 0.7.2 - - org.jenkins-ci.test - sample-plexus-component - 1.0 - test - diff --git a/test/src/test/java/hudson/maven/AbortedMavenBuildTest.java b/test/src/test/java/hudson/maven/AbortedMavenBuildTest.java deleted file mode 100644 index 9275040c8c..0000000000 --- a/test/src/test/java/hudson/maven/AbortedMavenBuildTest.java +++ /dev/null @@ -1,35 +0,0 @@ -package hudson.maven; - -import hudson.Launcher; -import hudson.model.BuildListener; -import hudson.model.Result; -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.HudsonTestCase; - -import java.io.IOException; - -public class AbortedMavenBuildTest extends HudsonTestCase { - @Bug(8054) - public void testBuildWrapperSeesAbortedStatus() throws Exception { - configureDefaultMaven(); - MavenModuleSet project = createMavenProject(); - TestBuildWrapper wrapper = new TestBuildWrapper(); - project.getBuildWrappersList().add(wrapper); - project.getReporters().add(new AbortingReporter()); - project.setGoals("clean"); - project.setScm(new ExtractResourceSCM(getClass().getResource("maven-empty-mod.zip"))); - MavenModuleSetBuild build = project.scheduleBuild2(0).get(); - assertEquals(Result.ABORTED, build.getResult()); - assertEquals(Result.ABORTED, wrapper.buildResultInTearDown); - } - - private static class AbortingReporter extends MavenReporter { - private static final long serialVersionUID = 1L; - - @Override - public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { - throw new InterruptedException(); - } - } -} diff --git a/test/src/test/java/hudson/maven/AbstractMaven3xBuildTest.java b/test/src/test/java/hudson/maven/AbstractMaven3xBuildTest.java deleted file mode 100755 index b69a03e573..0000000000 --- a/test/src/test/java/hudson/maven/AbstractMaven3xBuildTest.java +++ /dev/null @@ -1,263 +0,0 @@ -package hudson.maven; - -/* - * Olivier Lamy - * 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 hudson.Launcher; -import hudson.model.BuildListener; -import hudson.model.ParametersDefinitionProperty; -import hudson.model.Result; -import hudson.model.StringParameterDefinition; -import hudson.tasks.Maven.MavenInstallation; -import hudson.tasks.test.AbstractTestResultAction; -import hudson.tasks.test.TestResultProjectAction; -import org.apache.commons.io.FileUtils; -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.Email; -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.HudsonTestCase; - -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; - -/** - * @author Olivier Lamy - */ -public abstract class AbstractMaven3xBuildTest - extends HudsonTestCase { - - public abstract MavenInstallation configureMaven3x() throws Exception; - - public void testSimpleMaven3Build() throws Exception { - - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureMaven3x(); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven3-project.zip"))); - m.setGoals( "clean install" ); - MavenModuleSetBuild b = buildAndAssertSuccess(m); - assertTrue( MavenUtil.maven3orLater( b.getMavenVersionUsed() ) ); - } - - public void testSimpleMaven3BuildRedeployPublisher() throws Exception { - - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureMaven3x(); - m.setMaven( mavenInstallation.getName() ); - File repo = createTmpDir(); - FileUtils.cleanDirectory( repo ); - m.getReporters().add(new TestReporter()); - m.getPublishersList().add(new RedeployPublisher("",repo.toURI().toString(),true, false)); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven3-project.zip"))); - m.setGoals( "clean install" ); - MavenModuleSetBuild b = buildAndAssertSuccess(m); - assertTrue( MavenUtil.maven3orLater( b.getMavenVersionUsed() ) ); - File artifactDir = new File(repo,"com/mycompany/app/my-app/1.7-SNAPSHOT/"); - String[] files = artifactDir.list( new FilenameFilter() - { - - public boolean accept( File dir, String name ) - { - System.out.println("file name : " +name ); - return name.endsWith( ".jar" ); - } - }); - assertTrue("SNAPSHOT exist",!files[0].contains( "SNAPSHOT" )); - assertTrue("file not ended with -1.jar", files[0].endsWith( "-1.jar" )); - } - - public void testSiteBuildWithForkedMojo() throws Exception { - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureMaven3x(); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven3-project.zip"))); - m.setGoals( "clean site" ); - MavenModuleSetBuild b = buildAndAssertSuccess(m); - assertTrue( MavenUtil.maven3orLater( b.getMavenVersionUsed() ) ); - } - - @Bug(value=8395) - public void testMaven3BuildWrongScope() throws Exception { - - File pom = new File(this.getClass().getResource("test-pom-8395.xml").toURI()); - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureMaven3x(); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setRootPOM(pom.getAbsolutePath()); - m.setGoals( "clean validate" ); - MavenModuleSetBuild mmsb = m.scheduleBuild2( 0 ).get(); - assertBuildStatus( Result.FAILURE, mmsb ); - System.out.println("mmsb.getProject().getModules " + mmsb.getProject().getModules() ); - assertTrue( mmsb.getProject().getModules().isEmpty()); - } - - @Bug(value=8390) - public void testMaven3BuildWrongInheritence() throws Exception { - - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureMaven3x(); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("incorrect-inheritence-testcase.zip"))); - m.setGoals( "clean validate" ); - MavenModuleSetBuild mmsb = m.scheduleBuild2( 0 ).get(); - assertBuildStatus( Result.FAILURE, mmsb ); - System.out.println("mmsb.getProject().getModules " + mmsb.getProject().getModules() ); - assertTrue( mmsb.getProject().getModules().isEmpty()); - } - - @Bug(value=8445) - public void testMavenSeveralModulesInDirectory() throws Exception { - - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureMaven3x(); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("several-modules-in-directory.zip"))); - m.setGoals( "clean validate" ); - MavenModuleSetBuild mmsb = buildAndAssertSuccess(m); - assertFalse( mmsb.getProject().getModules().isEmpty()); - } - - @Email("https://groups.google.com/d/msg/hudson-users/Xhw00UopVN0/FA9YqDAIsSYJ") - public void testMavenWithDependencyVersionInEnvVar() throws Exception { - - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureMaven3x(); - ParametersDefinitionProperty parametersDefinitionProperty = - new ParametersDefinitionProperty(new StringParameterDefinition( "JUNITVERSION", "3.8.2" )); - - m.addProperty( parametersDefinitionProperty ); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("envars-maven-project.zip"))); - m.setGoals( "clean test-compile" ); - MavenModuleSetBuild mmsb = buildAndAssertSuccess(m); - assertFalse( mmsb.getProject().getModules().isEmpty()); - } - - @Bug(8484) - public void testMultiModMavenNonRecursive() throws Exception { - MavenInstallation mavenInstallation = configureMaven3x(); - MavenModuleSet m = createMavenProject(); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimod.zip"))); - m.setGoals( "-N validate" ); - assertTrue("MavenModuleSet.isNonRecursive() should be true", m.isNonRecursive()); - buildAndAssertSuccess(m); - assertEquals("not only one module", 1, m.getModules().size()); - } - - @Bug(8573) - public void testBuildTimeStampProperty() throws Exception { - MavenInstallation mavenInstallation = configureMaven3x(); - MavenModuleSet m = createMavenProject(); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("JENKINS-8573.zip"))); - m.setGoals( "process-resources" ); - buildAndAssertSuccess(m); - String content = m.getLastBuild().getWorkspace().child( "target/classes/test.txt" ).readToString(); - assertFalse( content.contains( "${maven.build.timestamp}") ); - assertFalse( content.contains( "${maven.build.timestamp}") ); - } - - @Bug(1557) - public void testDuplicateTestResults() throws Exception { - MavenInstallation mavenInstallation = configureMaven3x(); - MavenModuleSet m = createMavenProject(); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("JENKINS-1557.zip"))); - m.setGoals("verify"); - buildAndAssertSuccess(m); - - int totalCount = m.getModules().iterator().next() - .getAction(TestResultProjectAction.class).getLastTestResultAction().getTotalCount(); - assertEquals(4, totalCount); - } - - @Bug(9326) - public void testTychoTestResults() throws Exception { - MavenInstallation mavenInstallation = configureMaven3x(); - MavenModuleSet m = createMavenProject(); - m.setRootPOM( "org.foobar.build/pom.xml" ); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("JENKINS-9326.zip"),"foobar")); - m.setGoals("verify"); - buildAndAssertSuccess(m); - - System.out.println("modules size " + m.getModules()); - - - MavenModule testModule = null; - for (MavenModule mavenModule : m.getModules()) { - System.out.println("module " + mavenModule.getName() + "/" + mavenModule.getDisplayName()); - if ("org.foobar:org.foobar.test".equals( mavenModule.getName() )) testModule = mavenModule; - } - - AbstractTestResultAction trpa = testModule.getLastBuild().getTestResultAction(); - - int totalCount = trpa.getTotalCount(); - assertEquals(1, totalCount); - } - - @Bug(9326) - public void testTychoEclipseTestResults() throws Exception { - MavenInstallation mavenInstallation = configureMaven3x(); - MavenModuleSet m = createMavenProject(); - m.setRootPOM( "org.foobar.build/pom.xml" ); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("foobar_eclipse_with_fix.zip"),"foobar_eclipse")); - m.setGoals("verify"); - buildAndAssertSuccess(m); - - System.out.println("modules size " + m.getModules()); - - - MavenModule testModule = null; - for (MavenModule mavenModule : m.getModules()) { - System.out.println("module " + mavenModule.getName() + "/" + mavenModule.getDisplayName()); - if ("org.foobar:org.foobar.test".equals( mavenModule.getName() )) testModule = mavenModule; - } - - AbstractTestResultAction trpa = testModule.getLastBuild().getTestResultAction(); - - int totalCount = trpa.getTotalCount(); - assertEquals(1, totalCount); - } - - private static class TestReporter extends MavenReporter { - @Override - public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { - assertNotNull(build.getProject().getWorkspace()); - assertNotNull(build.getWorkspace()); - return true; - } - } - -} diff --git a/test/src/test/java/hudson/maven/Maven30xBuildTest.java b/test/src/test/java/hudson/maven/Maven30xBuildTest.java deleted file mode 100755 index 5c236ce046..0000000000 --- a/test/src/test/java/hudson/maven/Maven30xBuildTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package hudson.maven; - -/* - * Olivier Lamy - * 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 hudson.Launcher; -import hudson.model.BuildListener; -import hudson.model.ParametersDefinitionProperty; -import hudson.model.Result; -import hudson.model.StringParameterDefinition; -import hudson.tasks.Maven; -import hudson.tasks.Maven.MavenInstallation; -import hudson.tasks.test.AbstractTestResultAction; -import hudson.tasks.test.TestResultProjectAction; -import org.apache.commons.io.FileUtils; -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.Email; -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.HudsonTestCase; - -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; - -/** - * @author Olivier Lamy - */ -public class Maven30xBuildTest - extends AbstractMaven3xBuildTest { - - @Override - public MavenInstallation configureMaven3x() - throws Exception - { - return configureMaven3(); - } - -} diff --git a/test/src/test/java/hudson/maven/Maven31xBuildTest.java b/test/src/test/java/hudson/maven/Maven31xBuildTest.java deleted file mode 100755 index 449d782492..0000000000 --- a/test/src/test/java/hudson/maven/Maven31xBuildTest.java +++ /dev/null @@ -1,54 +0,0 @@ -package hudson.maven; - -/* - * Olivier Lamy - * 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 hudson.Launcher; -import hudson.model.BuildListener; -import hudson.model.ParametersDefinitionProperty; -import hudson.model.Result; -import hudson.model.StringParameterDefinition; -import hudson.tasks.Maven; -import hudson.tasks.Maven.MavenInstallation; -import hudson.tasks.test.AbstractTestResultAction; -import hudson.tasks.test.TestResultProjectAction; -import org.apache.commons.io.FileUtils; -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.Email; -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.HudsonTestCase; - -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; - -/** - * @author Olivier Lamy - */ -public class Maven31xBuildTest - extends AbstractMaven3xBuildTest { - - @Override - public MavenInstallation configureMaven3x() - throws Exception - { - return configureMaven31(); - } -} diff --git a/test/src/test/java/hudson/maven/MavenArgumentInterceptorTest.java b/test/src/test/java/hudson/maven/MavenArgumentInterceptorTest.java deleted file mode 100644 index 6709fd36b6..0000000000 --- a/test/src/test/java/hudson/maven/MavenArgumentInterceptorTest.java +++ /dev/null @@ -1,171 +0,0 @@ -package hudson.maven; - -/* - * The MIT License - * - * Copyright (c) 2011, Dominik Bartholdi - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -import hudson.Extension; -import hudson.Launcher; -import hudson.model.AbstractBuild; -import hudson.model.AbstractProject; -import hudson.model.BuildListener; -import hudson.model.Result; -import hudson.tasks.BuildWrapper; -import hudson.tasks.BuildWrapperDescriptor; -import hudson.tasks.Maven.MavenInstallation; -import hudson.util.ArgumentListBuilder; - -import java.io.IOException; -import java.util.Arrays; -import java.util.List; - -import net.sf.json.JSONObject; - -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.HudsonTestCase; -import org.kohsuke.stapler.StaplerRequest; - -/** - * @author Dominik Bartholdi (imod) - */ -public class MavenArgumentInterceptorTest extends HudsonTestCase { - - public void testSimpleMaven3BuildWithArgInterceptor_Goals() throws Exception { - - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureMaven3(); - m.setMaven(mavenInstallation.getName()); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven3-project.zip"))); - m.setGoals("dummygoal"); // build would fail with this goal - - // add an action to build, redefining the goals and options to be - // executed - m.getBuildWrappersList().add(new TestMvnBuildWrapper("clean")); - - MavenModuleSetBuild b = buildAndAssertSuccess(m); - assertTrue(MavenUtil.maven3orLater(b.getMavenVersionUsed())); - } - - public void testSimpleMaven3BuildWithArgInterceptor_ArgBuilder() throws Exception { - - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureMaven3(); - m.setMaven(mavenInstallation.getName()); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimodule-unit-failure.zip"))); - m.setGoals("clean install"); // build would fail because of failing unit - // tests - - // add an action to build, adding argument to skip the test execution - m.getBuildWrappersList().add(new TestMvnBuildWrapper(Arrays.asList("-DskipTests"))); - - MavenModuleSetBuild b = buildAndAssertSuccess(m); - assertTrue(MavenUtil.maven3orLater(b.getMavenVersionUsed())); - } - - private static class TestMvnArgInterceptor implements MavenArgumentInterceptorAction { - private String goalsAndOptions; - private List args; - - public TestMvnArgInterceptor(String goalsAndOptions) { - this.goalsAndOptions = goalsAndOptions; - } - - public TestMvnArgInterceptor(List args) { - this.args = args; - } - - public String getIconFileName() { - return null; - } - - public String getDisplayName() { - return null; - } - - public String getUrlName() { - return null; - } - - public String getGoalsAndOptions(MavenModuleSetBuild build) { - return goalsAndOptions; - } - - public ArgumentListBuilder intercept(ArgumentListBuilder mavenargs, MavenModuleSetBuild build) { - if (args != null) { - for (String arg : this.args) { - mavenargs.add(arg); - } - } - return mavenargs; - } - } - - public static class TestMvnBuildWrapper extends BuildWrapper { - public Result buildResultInTearDown; - private String goalsAndOptions; - private List args; - - public TestMvnBuildWrapper(String goalsAndOptions) { - this.goalsAndOptions = goalsAndOptions; - } - - public TestMvnBuildWrapper(List args) { - this.args = args; - } - - @Override - public Environment setUp(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException { - - if (goalsAndOptions != null) { - build.addAction(new TestMvnArgInterceptor(goalsAndOptions)); - } else if (args != null) { - build.addAction(new TestMvnArgInterceptor(args)); - } - - return new BuildWrapper.Environment() { - @Override - public boolean tearDown(AbstractBuild build, BuildListener listener) throws IOException, InterruptedException { - buildResultInTearDown = build.getResult(); - return true; - } - }; - } - - @Extension - public static class TestMvnBuildWrapperDescriptor extends BuildWrapperDescriptor { - @Override - public boolean isApplicable(AbstractProject project) { - return true; - } - - @Override - public BuildWrapper newInstance(StaplerRequest req, JSONObject formData) { - throw new UnsupportedOperationException(); - } - - @Override - public String getDisplayName() { - return this.getClass().getName(); - } - } - } -} diff --git a/test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java b/test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java deleted file mode 100755 index 1bcece674b..0000000000 --- a/test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java +++ /dev/null @@ -1,85 +0,0 @@ -package hudson.maven; - -import hudson.model.Result; -import hudson.tasks.Shell; -import java.util.concurrent.Callable; - -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.HudsonTestCase; -import org.jvnet.hudson.test.RunLoadCounter; - -/** - * @author Olivier Lamy - */ -public class MavenBuildSurefireFailedTest extends HudsonTestCase { - - @Bug(8415) - public void testMaven2Unstable() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setGoals( "test" ); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimodule-unit-failure.zip"))); - assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); - } - - @Bug(8415) - public void testMaven2Failed() throws Exception { - configureDefaultMaven(); - final MavenModuleSet m = createMavenProject(); - m.setGoals( "test -Dmaven.test.failure.ignore=false" ); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimodule-unit-failure.zip"))); - assertBuildStatus(Result.FAILURE, m.scheduleBuild2(0).get()); - // JENKINS-18895: - MavenModule failing = m.getModule("com.mycompany.app:my-app"); - assertEquals(Result.FAILURE, failing.getLastBuild().getResult()); - RunLoadCounter.prepare(failing); - assertEquals(Result.FAILURE, RunLoadCounter.assertMaxLoads(failing, 0, new Callable() { - @Override public Result call() throws Exception { - return m.getLastBuild().getResult(); - } - })); - } - - @Bug(8415) - public void testMaven3Unstable() throws Exception { - MavenModuleSet m = createMavenProject(); - m.setMaven( configureMaven3().getName() ); - m.setGoals( "test" ); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimodule-unit-failure.zip"))); - assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); - } - - @Bug(8415) - public void testMaven3Failed() throws Exception { - MavenModuleSet m = createMavenProject(); - m.setMaven( configureMaven3().getName() ); - m.setGoals( "test -Dmaven.test.failure.ignore=false" ); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimodule-unit-failure.zip"))); - assertBuildStatus(Result.FAILURE, m.scheduleBuild2(0).get()); - } - - @Bug(14102) - public void testMaven3SkipPostBuilder() throws Exception { - MavenModuleSet m = createMavenProject(); - m.setMaven( configureMaven3().getName() ); - m.setGoals( "test" ); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimodule-unit-failure.zip"))); - // run dummy command only if build state is SUCCESS - m.setRunPostStepsIfResult(Result.SUCCESS); - m.addPostBuilder(new Shell("no-valid-command")); - assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); - } - - @Bug(14102) - public void testMaven2SkipPostBuilder() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setGoals( "test" ); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimodule-unit-failure.zip"))); - // run dummy command only if build state is SUCCESS - m.setRunPostStepsIfResult(Result.SUCCESS); - m.addPostBuilder(new Shell("no-valid-command")); - assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); - } -} diff --git a/test/src/test/java/hudson/maven/MavenBuildTest.java b/test/src/test/java/hudson/maven/MavenBuildTest.java deleted file mode 100755 index 9dd02c337e..0000000000 --- a/test/src/test/java/hudson/maven/MavenBuildTest.java +++ /dev/null @@ -1,204 +0,0 @@ -package hudson.maven; - -import hudson.Launcher; -import hudson.model.BuildListener; -import hudson.model.ParametersDefinitionProperty; -import hudson.model.Result; -import hudson.model.StringParameterDefinition; -import hudson.tasks.Maven.MavenInstallation; -import hudson.tasks.test.AbstractTestResultAction; -import hudson.tasks.test.AggregatedTestResultAction; - -import java.io.File; -import java.io.IOException; -import java.util.Map; - -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.Email; -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.HudsonTestCase; -import org.jvnet.hudson.test.SingleFileSCM; - -/** - * @author Kohsuke Kawaguchi - */ -public class MavenBuildTest extends HudsonTestCase { - - /** - * NPE in {@code build.getProject().getWorkspace()} for {@link MavenBuild}. - */ - @Bug(4192) - public void testMavenWorkspaceExists() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("HUDSON-4192.zip"))); - buildAndAssertSuccess(m); - } - - /** - * {@link Result} getting set to SUCCESS even if there's a test failure, when the test failure - * does not happen in the final task segment. - */ - @Bug(4177) - public void testTestFailureInEarlyTaskSegment() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setGoals("clean install findbugs:findbugs"); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-test-failure-findbugs.zip"))); - assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); - } - - /** - * Verify that a compilation error properly shows up as a failure. - */ - public void testCompilationFailure() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setGoals("clean install"); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-compilation-failure.zip"))); - assertBuildStatus(Result.FAILURE, m.scheduleBuild2(0).get()); - } - - /** - * Workspace determination problem on non-aggregator style build. - */ - @Bug(4226) - public void testParallelModuleBuild() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setScm(new ExtractResourceSCM(getClass().getResource("multimodule-maven.zip"))); - - buildAndAssertSuccess(m); - - m.setAggregatorStyleBuild(false); - - // run module builds - buildAndAssertSuccess(m.getModule("test$module1")); - buildAndAssertSuccess(m.getModule("test$module1")); - } - - @Bug(value=8395) - public void testMaven2BuildWrongScope() throws Exception { - - File pom = new File(this.getClass().getResource("test-pom-8395.xml").toURI()); - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureDefaultMaven(); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setRootPOM(pom.getAbsolutePath()); - m.setGoals( "clean validate" ); - MavenModuleSetBuild mmsb = buildAndAssertSuccess(m); - assertFalse( mmsb.getProject().getModules().isEmpty()); - } - - @Bug(value=8390) - public void testMaven2BuildWrongInheritence() throws Exception { - - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureDefaultMaven(); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("incorrect-inheritence-testcase.zip"))); - m.setGoals( "clean validate" ); - MavenModuleSetBuild mmsb = buildAndAssertSuccess(m); - assertFalse( mmsb.getProject().getModules().isEmpty()); - } - - @Bug(value=8445) - public void testMaven2SeveralModulesInDirectory() throws Exception { - - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureDefaultMaven(); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("several-modules-in-directory.zip"))); - m.setGoals( "clean validate" ); - MavenModuleSetBuild mmsb = buildAndAssertSuccess(m); - assertFalse( mmsb.getProject().getModules().isEmpty()); - } - - @Email("https://groups.google.com/d/msg/hudson-users/Xhw00UopVN0/FA9YqDAIsSYJ") - public void testMavenWithDependencyVersionInEnvVar() throws Exception { - - MavenModuleSet m = createMavenProject(); - MavenInstallation mavenInstallation = configureDefaultMaven(); - ParametersDefinitionProperty parametersDefinitionProperty = - new ParametersDefinitionProperty(new StringParameterDefinition( "JUNITVERSION", "3.8.2" )); - - m.addProperty( parametersDefinitionProperty ); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("envars-maven-project.zip"))); - m.setGoals( "clean test-compile" ); - MavenModuleSetBuild mmsb = buildAndAssertSuccess(m); - assertFalse( mmsb.getProject().getModules().isEmpty()); - } - - @Bug(8573) - public void testBuildTimeStampProperty() throws Exception { - MavenInstallation mavenInstallation = configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setMaven( mavenInstallation.getName() ); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("JENKINS-8573.zip"))); - m.setGoals( "process-resources" ); - buildAndAssertSuccess(m); - String content = m.getLastBuild().getWorkspace().child( "target/classes/test.txt" ).readToString(); - assertFalse( content.contains( "${maven.build.timestamp}") ); - assertFalse( content.contains( "${maven.build.timestamp}") ); - - System.out.println( "content " + content ); - } - - @Bug(value=15865) - public void testMavenFailsafePluginTestResultsAreRecorded() throws Exception { - - // GIVEN: a Maven project with maven-failsafe-plugin and Maven 2.2.1 - MavenModuleSet mavenProject = createMavenProject(); - MavenInstallation mavenInstallation = configureDefaultMaven(); - mavenProject.setMaven(mavenInstallation.getName()); - mavenProject.getReporters().add(new TestReporter()); - mavenProject.setScm(new ExtractResourceSCM(getClass().getResource("JENKINS-15865.zip"))); - mavenProject.setGoals( "clean install" ); - - // WHEN project is build - MavenModuleSetBuild mmsb = buildAndAssertSuccess(mavenProject); - - // THEN we have a testresult recorded - AggregatedTestResultAction aggregatedTestResultAction = mmsb.getAggregatedTestResultAction(); - assertNotNull(aggregatedTestResultAction); - assertEquals(1, aggregatedTestResultAction.getTotalCount()); - - Map moduleBuilds = mmsb.getModuleLastBuilds(); - assertEquals(1, moduleBuilds.size()); - MavenBuild moduleBuild = moduleBuilds.values().iterator().next(); - AbstractTestResultAction testResultAction = moduleBuild.getTestResultAction(); - assertNotNull(testResultAction); - assertEquals(1, testResultAction.getTotalCount()); - } - - @Bug(18178) - public void testExtensionsConflictingWithCore() throws Exception { - MavenModuleSet m = createMavenProject(); - m.setMaven(configureDefaultMaven().getName()); - m.setScm(new SingleFileSCM("pom.xml", - "4.0.0" + - "ga0" + - "" + - "org.springframework.build.awsorg.springframework.build.aws.maven3.0.0.RELEASE" + - "")); - buildAndAssertSuccess(m); - } - - private static class TestReporter extends MavenReporter { - private static final long serialVersionUID = 1L; - - @Override - public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { - assertNotNull(build.getWorkspace()); - return true; - } - } - -} diff --git a/test/src/test/java/hudson/maven/MavenEmptyModuleTest.java b/test/src/test/java/hudson/maven/MavenEmptyModuleTest.java deleted file mode 100644 index b8ad72048a..0000000000 --- a/test/src/test/java/hudson/maven/MavenEmptyModuleTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package hudson.maven; - -import org.jvnet.hudson.test.HudsonTestCase; -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.ExtractResourceSCM; - - -import hudson.Launcher; -import hudson.model.BuildListener; - -import java.io.IOException; - -/** - * @author Andrew Bayer - */ -public class MavenEmptyModuleTest extends HudsonTestCase { - /** - * Verify that a build will work with a module and a module - */ - @Bug(4442) - public void testEmptyModuleParsesAndBuilds() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-empty-mod.zip"))); - buildAndAssertSuccess(m); - } - - private static class TestReporter extends MavenReporter { - private static final long serialVersionUID = 1L; - - @Override - public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { - assertNotNull(build.getWorkspace()); - return true; - } - } -} \ No newline at end of file diff --git a/test/src/test/java/hudson/maven/MavenEnvironmentContributingActionTest.java b/test/src/test/java/hudson/maven/MavenEnvironmentContributingActionTest.java deleted file mode 100644 index 414a0c5156..0000000000 --- a/test/src/test/java/hudson/maven/MavenEnvironmentContributingActionTest.java +++ /dev/null @@ -1,143 +0,0 @@ -package hudson.maven; - -import hudson.EnvVars; -import hudson.Extension; -import hudson.Launcher; -import hudson.model.Action; -import hudson.model.BuildListener; -import hudson.model.EnvironmentContributingAction; -import hudson.model.InvisibleAction; -import hudson.model.Result; -import hudson.model.AbstractBuild; -import hudson.model.AbstractProject; -import hudson.model.Cause; -import hudson.tasks.BuildWrapper; -import hudson.tasks.BuildWrapperDescriptor; -import hudson.util.ArgumentListBuilder; - -import java.io.IOException; -import java.util.Collection; -import java.util.Collections; - -import net.sf.json.JSONObject; - -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.JenkinsRule; -import org.kohsuke.stapler.StaplerRequest; - -/** - * This test case verifies that a maven build also takes EnvironmentContributingAction into account to resolve variables on the command line - * - * @see EnvironmentContributingAction - * @author Dominik Bartholdi (imod) - */ -public class MavenEnvironmentContributingActionTest { - - @Rule - public JenkinsRule j = new JenkinsRule(); - - @Test - @Bug(17555) - public void envVariableFromEnvironmentContributingActionMustBeAvailableInMavenModuleSetBuild() throws Exception { - j.jenkins.getInjector().injectMembers(this); - - final MavenModuleSet p = j.createMavenProject("mvn"); - - p.setMaven(j.configureMaven3().getName()); - p.setScm(new ExtractResourceSCM(getClass().getResource("maven3-project.zip"))); - p.setGoals("initialize -Dval=${KEY}"); - - p.getBuildWrappersList().add(new TestMvnBuildWrapper("-Dval=MY_VALUE")); - - j.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0, new Cause.UserIdCause()).get()); - } - - /** - * This action contributes env variables - */ - private static final class TestAction extends InvisibleAction implements EnvironmentContributingAction { - private final String key, value; - - public TestAction(String key, String value) { - this.key = key; - this.value = value; - } - - @Override - public void buildEnvVars(AbstractBuild arg0, EnvVars vars) { - vars.put(key, value); - } - - } - - /** - * This action verifies that the variable in the maven arguments got replaced - */ - private static class MvnCmdLineVerifier extends InvisibleAction implements MavenArgumentInterceptorAction { - private String containsString; - - public MvnCmdLineVerifier(String containsString) { - this.containsString = containsString; - } - - @Override - public ArgumentListBuilder intercept(ArgumentListBuilder cli, MavenModuleSetBuild arg1) { - String all = cli.toString(); - Assert.assertTrue(containsString + " was not found in the goals arguments", all.contains(containsString)); - return cli; - } - - @Override - public String getGoalsAndOptions(MavenModuleSetBuild arg0) { - return null; - } - } - - /** - * This wrapper adds a EnvironmentContributingAction to the build (see TestAction) and also adds the MvnCmdLineVerifier to the build to test whether the variable really got replaced - */ - public static class TestMvnBuildWrapper extends BuildWrapper { - private String containsString; - - public TestMvnBuildWrapper(String expectedString) { - this.containsString = expectedString; - } - - @Override - public Collection getProjectActions(AbstractProject job) { - return Collections.singletonList(new TestAction("KEY", "MY_VALUE")); - } - - @Override - public Environment setUp(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException { - - build.addAction(new MvnCmdLineVerifier(containsString)); - - return new BuildWrapper.Environment() { - }; - } - - @Extension - public static class TestMvnBuildWrapperDescriptor extends BuildWrapperDescriptor { - @Override - public boolean isApplicable(AbstractProject project) { - return true; - } - - @Override - public BuildWrapper newInstance(StaplerRequest req, JSONObject formData) { - throw new UnsupportedOperationException(); - } - - @Override - public String getDisplayName() { - return this.getClass().getName(); - } - } - } - -} diff --git a/test/src/test/java/hudson/maven/MavenJellyTest.java b/test/src/test/java/hudson/maven/MavenJellyTest.java deleted file mode 100644 index d501362862..0000000000 --- a/test/src/test/java/hudson/maven/MavenJellyTest.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package hudson.maven; - -import hudson.remoting.Which; -import junit.framework.Test; -import junit.framework.TestCase; -import org.jvnet.hudson.test.JellyTestSuiteBuilder; - -/** - * Runs Jelly checks on maven-plugin. - * - * @author Andrew Bayer - */ -public class MavenJellyTest extends TestCase { - public static Test suite() throws Exception { - return JellyTestSuiteBuilder.build(Which.jarFile(MavenModuleSet.class),true); - } -} diff --git a/test/src/test/java/hudson/maven/MavenModuleSetTest.java b/test/src/test/java/hudson/maven/MavenModuleSetTest.java deleted file mode 100644 index 2b379d7c01..0000000000 --- a/test/src/test/java/hudson/maven/MavenModuleSetTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package hudson.maven; - -import hudson.maven.local_repo.PerJobLocalRepositoryLocator; -import hudson.model.Item; -import org.jvnet.hudson.test.Bug; - -import org.jvnet.hudson.test.HudsonTestCase; - -/** - * @author Kohsuke Kawaguchi - */ -public class MavenModuleSetTest extends HudsonTestCase { - public void testConfigRoundtripLocalRepository() throws Exception { - MavenModuleSet p = createMavenProject(); - configRoundtrip((Item) p); - - assertNull(p.getExplicitLocalRepository()); - - // make sure it roundtrips - PerJobLocalRepositoryLocator before = new PerJobLocalRepositoryLocator(); - p.setLocalRepository(before); - configRoundtrip((Item)p); - assertEqualDataBoundBeans(p.getLocalRepository(),before); - assertTrue(before!=p.getLocalRepository()); - } - - @Bug(17402) - public void testGetItem() throws Exception { - assertNull(createMavenProject().getItem("invalid")); - } - -} diff --git a/test/src/test/java/hudson/maven/MavenMultiModuleLogRotatorCleanArtifactsTest.java b/test/src/test/java/hudson/maven/MavenMultiModuleLogRotatorCleanArtifactsTest.java deleted file mode 100644 index 114c783552..0000000000 --- a/test/src/test/java/hudson/maven/MavenMultiModuleLogRotatorCleanArtifactsTest.java +++ /dev/null @@ -1,109 +0,0 @@ -/** - * - */ -package hudson.maven; - -import hudson.FilePath; -import hudson.Launcher; -import hudson.maven.reporters.MavenFingerprinter; -import hudson.model.BuildListener; -import hudson.tasks.LogRotator; -import hudson.tasks.Maven.MavenInstallation; - -import java.io.File; -import java.io.IOException; -import java.util.Collection; - -import org.apache.commons.io.FileUtils; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.ExtractResourceWithChangesSCM; -import org.jvnet.hudson.test.For; -import org.jvnet.hudson.test.JenkinsRule; - -/** - * - * Test that looks in jobs archive with 2 builds. When LogRotator set as build - * discarder with settings to keep only 1 build with artifacts, test searches - * for jars in archive for build one and build two, expecting no jars in build 1 - * and expecting jars in build 2. - * - * - */ -public class MavenMultiModuleLogRotatorCleanArtifactsTest { - - - @Rule - public JenkinsRule j = new JenkinsRule(); - private MavenModuleSet m; - private FilePath jobs; - - private static class TestReporter extends MavenReporter { - /** - * - */ - private static final long serialVersionUID = 1L; - - @Override - public boolean end(MavenBuild build, Launcher launcher, - BuildListener listener) throws InterruptedException, - IOException { - Assert.assertNotNull(build.getProject().getSomeWorkspace()); - Assert.assertNotNull(build.getWorkspace()); - return true; - } - } - - @Before - public void setUp() throws Exception { - j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - m = j.createMavenProject(); - m.setBuildDiscarder(new LogRotator("-1", "2", "-1", "1")); - m.getReporters().add(new TestReporter()); - m.getReporters().add(new MavenFingerprinter()); - m.setScm(new ExtractResourceWithChangesSCM(getClass().getResource( - "maven-multimod.zip"), getClass().getResource( - "maven-multimod-changes.zip"))); - j.buildAndAssertSuccess(m); - // Now run a second build with the changes. - m.setIncrementalBuild(false); - j.buildAndAssertSuccess(m); - FilePath workspace = m.getSomeWorkspace(); - FilePath parent = workspace.getParent().getParent(); - jobs = new FilePath(parent, "jobs"); - } - - @Test - @Bug(17508) - @For({MavenModuleSetBuild.class, LogRotator.class}) - @SuppressWarnings("unchecked") - public void testArtifactsAreDeletedInBuildOneWhenBuildDiscarderRun() - throws Exception { - File directory = new File(new FilePath(jobs, "test0/builds/1").getRemote()); - Collection files = FileUtils.listFiles(directory, - new String[] { "jar" }, true); - Assert.assertTrue( - "Found jars in previous build, that should not happen", - files.isEmpty()); - Collection files2 = FileUtils.listFiles(new File(new FilePath( - jobs, "test0/builds/2").getRemote()), new String[] { "jar" }, true); - Assert.assertFalse("No jars in last build ALERT!", files2.isEmpty()); - } - - /** - * Performs a third build and expecting build one to be deleted - * @throws Exception - */ - @For({MavenModuleSetBuild.class, LogRotator.class}) - @Test - public void testArtifactsOldBuildsDeletedWhenBuildDiscarderRun() - throws Exception { - j.buildAndAssertSuccess(m); - File directory = new File(new FilePath(jobs, "test0/builds/1").getRemote()); - Assert.assertFalse("oops the build should have been deleted", directory.exists()); - } - -} diff --git a/test/src/test/java/hudson/maven/MavenMultiModuleTest.java b/test/src/test/java/hudson/maven/MavenMultiModuleTest.java deleted file mode 100644 index 91137ba101..0000000000 --- a/test/src/test/java/hudson/maven/MavenMultiModuleTest.java +++ /dev/null @@ -1,622 +0,0 @@ -package hudson.maven; - -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import hudson.FilePath; -import hudson.Functions; -import org.junit.Assert; -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.ExtractResourceWithChangesSCM; -import org.jvnet.hudson.test.ExtractChangeLogSet; - -import hudson.Launcher; -import hudson.Util; -import hudson.maven.reporters.MavenArtifactRecord; -import hudson.maven.reporters.MavenFingerprinter; -import hudson.model.AbstractBuild; -import hudson.model.BuildListener; -import hudson.model.Job; -import hudson.model.PermalinkProjectAction; -import hudson.model.Result; -import hudson.model.Run; -import hudson.tasks.Fingerprinter.FingerprintAction; -import hudson.tasks.Maven.MavenInstallation; -import java.io.File; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; -import java.util.TreeMap; -import jenkins.model.ArtifactManager; -import java.util.Set; -import java.util.TreeSet; -import jenkins.model.ArtifactManagerConfiguration; -import jenkins.model.ArtifactManagerFactory; -import jenkins.util.VirtualFile; -import static org.junit.Assert.*; -import org.junit.Assume; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - -/** - * @author Andrew Bayer - */ -public class MavenMultiModuleTest { - - @Rule public JenkinsRule j = new JenkinsRule(); - - /** - * NPE in {@code build.getProject().getWorkspace()} for {@link MavenBuild}. - */ - @Bug(4192) - @Test public void multiModMavenWsExists() throws Exception { - j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet m = j.createMavenProject(); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimod.zip"))); - assertFalse("MavenModuleSet.isNonRecursive() should be false", m.isNonRecursive()); - j.buildAndAssertSuccess(m); - } - - @Bug(18846) - @Test public void symlinksUpdated() throws Exception { - Assume.assumeFalse(Functions.isWindows()); - j.configureDefaultMaven(); - MavenModuleSet mms = j.createMavenProject(); - mms.setScm(new ExtractResourceSCM(MavenMultiModuleTest.class.getResource("maven-multimod.zip"))); - j.buildAndAssertSuccess(mms); - MavenModule mm = mms.getModule("org.jvnet.hudson.main.test.multimod:moduleA"); - j.buildAndAssertSuccess(mms); - assertEquals(2, mms.getLastStableBuild().number); - assertEquals(mms.getLastBuild().getId(), Util.resolveSymlink(new File(mms.getRootDir(), "builds/2"))); - assertEquals("2", Util.resolveSymlink(new File(mms.getRootDir(), "builds/lastStableBuild"))); - assertEquals("builds/lastStableBuild", Util.resolveSymlink(new File(mms.getRootDir(), "lastStable"))); - assertEquals("[lastBuild, lastStableBuild, lastSuccessfulBuild]", permalinks(mms).toString()); - assertEquals(2, mm.getLastStableBuild().number); - assertEquals(mm.getLastBuild().getId(), Util.resolveSymlink(new File(mm.getRootDir(), "builds/2"))); - assertEquals("2", Util.resolveSymlink(new File(mm.getRootDir(), "builds/lastStableBuild"))); - assertEquals("builds/lastStableBuild", Util.resolveSymlink(new File(mm.getRootDir(), "lastStable"))); - assertEquals("[lastBuild, lastStableBuild, lastSuccessfulBuild]", permalinks(mm).toString()); - } - private static Set permalinks(Job j) { - Set r = new TreeSet(); - for (PermalinkProjectAction.Permalink l : j.getPermalinks()) { - if (l.resolve(j) != null) { - r.add(l.getId()); - } - } - return r; - } - - @Test public void incrementalMultiModMaven() throws Exception { - j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet m = j.createMavenProject(); - m.getReporters().add(new TestReporter()); - m.getReporters().add(new MavenFingerprinter()); - m.setScm(new ExtractResourceWithChangesSCM(getClass().getResource("maven-multimod.zip"), - getClass().getResource("maven-multimod-changes.zip"))); - - j.buildAndAssertSuccess(m); - - // Now run a second build with the changes. - m.setIncrementalBuild(true); - j.buildAndAssertSuccess(m); - - MavenModuleSetBuild pBuild = m.getLastBuild(); - ExtractChangeLogSet changeSet = (ExtractChangeLogSet) pBuild.getChangeSet(); - - assertFalse("ExtractChangeLogSet should not be empty.", changeSet.isEmptySet()); - - for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { - String parentModuleName = modBuild.getParent().getModuleName().toString(); - if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleA")) { - assertEquals("moduleA should have Result.NOT_BUILT", Result.NOT_BUILT, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleB")) { - assertEquals("moduleB should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleC")) { - assertEquals("moduleC should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - } - - long summedModuleDuration = 0; - for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { - summedModuleDuration += modBuild.getDuration(); - } - assertTrue("duration of moduleset build should be greater-equal than sum of the module builds", - pBuild.getDuration() >= summedModuleDuration); - - assertFingerprintWereRecorded(pBuild); - } - - private void assertFingerprintWereRecorded(MavenModuleSetBuild modulesetBuild) { - boolean mustHaveFingerprints = false; - for (MavenBuild moduleBuild : modulesetBuild.getModuleLastBuilds().values()) { - if (moduleBuild.getResult() != Result.NOT_BUILT && moduleBuild.getResult() != Result.ABORTED) { - assertFingerprintWereRecorded(moduleBuild); - mustHaveFingerprints = true; - } - } - - if (mustHaveFingerprints) { - FingerprintAction action = modulesetBuild.getAction(FingerprintAction.class); - Assert.assertNotNull(action); - Assert.assertFalse(action.getFingerprints().isEmpty()); - } - } - - private void assertFingerprintWereRecorded(MavenBuild moduleBuild) { - FingerprintAction action = moduleBuild.getAction(FingerprintAction.class); - Assert.assertNotNull(action); - Assert.assertFalse(action.getFingerprints().isEmpty()); - - MavenArtifactRecord artifactRecord = moduleBuild.getAction(MavenArtifactRecord.class); - Assert.assertNotNull(artifactRecord); - String fingerprintName = artifactRecord.mainArtifact.groupId + ":" + artifactRecord.mainArtifact.fileName; - - Assert.assertTrue("Expected fingerprint " + fingerprintName + " in module build " + moduleBuild, - action.getFingerprints().containsKey(fingerprintName)); - - // we should assert more - i.e. that all dependencies are fingerprinted, too, - // but it's complicated to find out the dependencies of the build - } - - @Bug(5357) - @Test public void incrRelMultiModMaven() throws Exception { - j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet m = j.createMavenProject(); - m.setRootPOM("parent/pom.xml"); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceWithChangesSCM(getClass().getResource("maven-multimod-rel-base.zip"), - getClass().getResource("maven-multimod-changes.zip"))); - - j.buildAndAssertSuccess(m); - - // Now run a second build with the changes. - m.setIncrementalBuild(true); - j.buildAndAssertSuccess(m); - - MavenModuleSetBuild pBuild = m.getLastBuild(); - ExtractChangeLogSet changeSet = (ExtractChangeLogSet) pBuild.getChangeSet(); - - assertFalse("ExtractChangeLogSet should not be empty.", changeSet.isEmptySet()); - - for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { - String parentModuleName = modBuild.getParent().getModuleName().toString(); - if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleA")) { - assertEquals("moduleA should have Result.NOT_BUILT", Result.NOT_BUILT, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleB")) { - assertEquals("moduleB should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleC")) { - assertEquals("moduleC should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - } - - long summedModuleDuration = 0; - for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { - summedModuleDuration += modBuild.getDuration(); - } - assertTrue("duration of moduleset build should be greater-equal than sum of the module builds", - pBuild.getDuration() >= summedModuleDuration); - } - - - @Bug(6544) - @Ignore("kutzi 10/10/11 ignore test until I can figure out why it fails sometimes") - @Test public void estimatedDurationForIncrementalMultiModMaven() - throws Exception { - j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet m = j.createMavenProject(); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceWithChangesSCM(getClass().getResource( - "maven-multimod.zip"), getClass().getResource( - "maven-multimod-changes.zip"))); - - j.buildAndAssertSuccess(m); - - // Now run a second, incremental build with the changes. - m.setIncrementalBuild(true); - j.buildAndAssertSuccess(m); - - MavenModuleSetBuild lastBuild = m.getLastBuild(); - MavenModuleSetBuild previousBuild = lastBuild.getPreviousBuild(); - assertNull("There should be only one previous build", previousBuild.getPreviousBuild()); - - // Since the estimated duration is calculated based on the previous builds - // and there was only one previous build (which built all modules) and this build - // did only build one module, the estimated duration of this build must be - // smaller than the duration of the previous build. - // (It's highly unlikely that the durations are equal, but I've already seen it fail. - // Therefore <= instead of <) - assertTrue("Estimated duration should be <= " + previousBuild.getDuration() - + ", but is " + lastBuild.getEstimatedDuration(), - lastBuild.getEstimatedDuration() <= previousBuild.getDuration()); - } - - /** - * NPE in {@code getChangeSetFor(m)} in {@link MavenModuleSetBuild} when incremental build is - * enabled and a new module is added. - */ - @Test public void newModMultiModMaven() throws Exception { - j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet m = j.createMavenProject(); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceWithChangesSCM(getClass().getResource("maven-multimod.zip"), - getClass().getResource("maven-multimod-changes.zip"))); - - m.setIncrementalBuild(true); - j.buildAndAssertSuccess(m); - } - - /** - * When "-N' or "--non-recursive" show up in the goals, any child modules should be ignored. - */ - @Bug(4491) - @Test public void multiModMavenNonRecursiveParsing() throws Exception { - j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet m = j.createMavenProject(); - m.setGoals("clean install -N"); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimod.zip"))); - - j.buildAndAssertSuccess(m); - - MavenModuleSetBuild pBuild = m.getLastBuild(); - - for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { - String parentModuleName = modBuild.getParent().getModuleName().toString(); - if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:multimod-top")) { - assertEquals("moduleA should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleA")) { - assertEquals("moduleA should have Result.NOT_BUILT", Result.NOT_BUILT, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleB")) { - assertEquals("moduleB should have Result.NOT_BUILT", Result.NOT_BUILT, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleC")) { - assertEquals("moduleC should have Result.NOT_BUILT", Result.NOT_BUILT, modBuild.getResult()); - } - - } - - } - - /** - * Module failures in build X should lead to those modules being re-run in build X+1, even if - * incremental build is enabled and nothing changed in those modules. - */ - @Bug(4152) - @Test public void incrementalMultiModWithErrorsMaven() throws Exception { - j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet m = j.createMavenProject(); - m.setIncrementalBuild(true); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceWithChangesSCM(getClass().getResource("maven-multimod-incr.zip"), - getClass().getResource("maven-multimod-changes.zip"))); - - j.assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); - MavenModuleSetBuild pBuild = m.getLastBuild(); - - for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { - String parentModuleName = modBuild.getParent().getModuleName().toString(); - if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleA")) { - assertEquals("moduleA should have Result.UNSTABLE", Result.UNSTABLE, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleB")) { - assertEquals("moduleB should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleC")) { - assertEquals("moduleC should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleD")) { - assertEquals("moduleD should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - } - - // Now run a second build with the changes. - j.assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); - - pBuild = m.getLastBuild(); - ExtractChangeLogSet changeSet = (ExtractChangeLogSet) pBuild.getChangeSet(); - - assertFalse("ExtractChangeLogSet should not be empty.", changeSet.isEmptySet()); - // changelog contains a change for module B - assertEquals("Parent build should have Result.UNSTABLE", Result.UNSTABLE, pBuild.getResult()); - - for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { - String parentModuleName = modBuild.getParent().getModuleName().toString(); - // A must be build again, because it was UNSTABLE before - if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleA")) { - assertEquals("moduleA should have Result.UNSTABLE", Result.UNSTABLE, modBuild.getResult()); - } - // B must be build, because it has changes - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleB")) { - assertEquals("moduleB should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - // C must be build, because it depends on B - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleC")) { - assertEquals("moduleC should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - // D must not be build - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleD")) { - assertEquals("moduleD should have Result.NOT_BUILT", Result.NOT_BUILT, modBuild.getResult()); - } - } - } - - /** - * If "deploy modules" is checked and aggregator build failed - * then all modules build this time, have to be build next time, again. - */ - @Bug(5121) - @Test public void incrementalRedeployAfterAggregatorError() throws Exception { - j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet m = j.createMavenProject(); - m.setIncrementalBuild(true); - m.getReporters().add(new TestReporter()); - m.getPublishers().add(new DummyRedeployPublisher()); - m.setScm(new ExtractResourceWithChangesSCM(getClass().getResource("maven-multimod-incr.zip"), - getClass().getResource("maven-multimod-changes.zip"))); - - j.assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); - MavenModuleSetBuild pBuild = m.getLastBuild(); - - for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { - String parentModuleName = modBuild.getParent().getModuleName().toString(); - if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleA")) { - assertEquals("moduleA should have Result.UNSTABLE", Result.UNSTABLE, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleB")) { - assertEquals("moduleB should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleC")) { - assertEquals("moduleC should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleD")) { - assertEquals("moduleD should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - } - - // Now run a second build. - j.assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); - - pBuild = m.getLastBuild(); - ExtractChangeLogSet changeSet = (ExtractChangeLogSet) pBuild.getChangeSet(); - - assertFalse("ExtractChangeLogSet should not be empty.", changeSet.isEmptySet()); - // changelog contains a change for module B - assertEquals("Parent build should have Result.UNSTABLE", Result.UNSTABLE, pBuild.getResult()); - - for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { - String parentModuleName = modBuild.getParent().getModuleName().toString(); - // A must be build again, because it was UNSTABLE before - if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleA")) { - assertEquals("moduleA should have Result.UNSTABLE", Result.UNSTABLE, modBuild.getResult()); - } - // B must be build, because it has changes - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleB")) { - assertEquals("moduleB should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - // C must be build, because it depends on B - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleC")) { - assertEquals("moduleC should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - // D must be build again, because it needs to be deployed now - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleD")) { - assertEquals("moduleD should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - } - } - - /** - * Test failures in a child module should lead to the parent being marked as unstable. - */ - @Bug(4378) - @Test public void multiModWithTestFailuresMaven() throws Exception { - j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet m = j.createMavenProject(); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimod-incr.zip"))); - - j.assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); - - MavenModuleSetBuild pBuild = m.getLastBuild(); - - assertEquals("Parent build should have Result.UNSTABLE", Result.UNSTABLE, pBuild.getResult()); - - for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { - String parentModuleName = modBuild.getParent().getModuleName().toString(); - if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleA")) { - assertEquals("moduleA should have Result.UNSTABLE", Result.UNSTABLE, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleB")) { - assertEquals("moduleB should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleC")) { - assertEquals("moduleC should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod.incr:moduleD")) { - assertEquals("moduleD should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - } - } - - @Bug(8484) - @Test public void multiModMavenNonRecursive() throws Exception { - j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet m = j.createMavenProject(); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimod.zip"))); - m.setGoals( "-N validate" ); - assertTrue("MavenModuleSet.isNonRecursive() should be true", m.isNonRecursive()); - j.buildAndAssertSuccess(m); - assertEquals("not only one module", 1, m.getModules().size()); - } - - @Bug(17713) - @Test public void modulesPageLinks() throws Exception { - j.configureMaven3(); - MavenModuleSet ms = j.createMavenProject(); - ms.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimod.zip"))); - j.buildAndAssertSuccess(ms); - MavenModule m = ms.getModule("org.jvnet.hudson.main.test.multimod:moduleA"); - assertNotNull(m); - assertEquals(1, m.getLastBuild().getNumber()); - JenkinsRule.WebClient wc = j.createWebClient(); - HtmlPage modulesPage = wc.getPage(ms, "modules"); - modulesPage.getAnchorByText(m.getDisplayName()).openLinkInNewWindow(); - } - - @Bug(17236) - @Test public void artifactArchiving() throws Exception { - ArtifactManagerConfiguration.get().getArtifactManagerFactories().add(new TestAMF()); - j.configureDefaultMaven(); // using Maven 2 so we can test single-module builds - MavenModuleSet mms = j.createMavenProject(); - mms.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimod.zip"))); - mms.setAssignedNode(j.createOnlineSlave()); - j.buildAndAssertSuccess(mms); - // We want all the artifacts in a given module to be archived in one operation. But modules are archived separately. - Map> expected = new TreeMap>(); - FilePath ws = mms.getModule("org.jvnet.hudson.main.test.multimod$multimod-top").getBuildByNumber(1).getWorkspace(); - expected.put("org.jvnet.hudson.main.test.multimod:multimod-top", Collections.singletonMap("org.jvnet.hudson.main.test.multimod/multimod-top/1.0-SNAPSHOT/multimod-top-1.0-SNAPSHOT.pom", new FilePath(ws.getChannel(), "…/org/jvnet/hudson/main/test/multimod/multimod-top/1.0-SNAPSHOT/multimod-top-1.0-SNAPSHOT.pom"))); - for (String module : new String[] {"moduleA", "moduleB", "moduleC"}) { - Map m = new TreeMap(); - ws = mms.getModule("org.jvnet.hudson.main.test.multimod$" + module).getBuildByNumber(1).getWorkspace(); - m.put("org.jvnet.hudson.main.test.multimod/" + module + "/1.0-SNAPSHOT/" + module + "-1.0-SNAPSHOT.pom", ws.child("pom.xml")); - m.put("org.jvnet.hudson.main.test.multimod/" + module + "/1.0-SNAPSHOT/" + module + "-1.0-SNAPSHOT.jar", ws.child("target/" + module + "-1.0-SNAPSHOT.jar")); - expected.put("org.jvnet.hudson.main.test.multimod:" + module, m); - } - assertEquals(expected.toString(), TestAM.archivings.toString()); // easy to read - assertEquals(expected, TestAM.archivings); // compares also FileChannel - // Also check single-module build. - expected.clear(); - TestAM.archivings.clear(); - MavenBuild isolated = j.buildAndAssertSuccess(mms.getModule("org.jvnet.hudson.main.test.multimod$moduleA")); - assertEquals(2, isolated.number); - Map m = new TreeMap(); - ws = isolated.getWorkspace(); - m.put("org.jvnet.hudson.main.test.multimod/moduleA/1.0-SNAPSHOT/moduleA-1.0-SNAPSHOT.pom", ws.child("pom.xml")); - m.put("org.jvnet.hudson.main.test.multimod/moduleA/1.0-SNAPSHOT/moduleA-1.0-SNAPSHOT.jar", ws.child("target/moduleA-1.0-SNAPSHOT.jar")); - expected.put("org.jvnet.hudson.main.test.multimod:moduleA", m); - assertEquals(expected, TestAM.archivings); - } - - public static final class TestAMF extends ArtifactManagerFactory { - @Override public ArtifactManager managerFor(Run build) { - return new TestAM(build); - } - } - public static final class TestAM extends ArtifactManager { - static final Map> archivings = new TreeMap>(); - transient Run build; - TestAM(Run build) { - onLoad(build); - } - @Override public void onLoad(Run build) { - this.build = build; - } - @Override public void archive(FilePath workspace, Launcher launcher, BuildListener listener, Map artifacts) throws IOException, InterruptedException { - String name = build.getParent().getName(); - if (archivings.containsKey(name)) { - // Would be legitimate only if some archived files for a given module were outside workspace, such as repository parent POM, *and* others were inside, which is not the case in this test. - throw new IOException("repeated archiving to " + name); - } - Map m = new TreeMap(); - for (Map.Entry e : artifacts.entrySet()) { - FilePath f = workspace.child(e.getValue()); - if (f.exists()) { - if (f.getRemote().replace('\\', '/').contains("/org/jvnet/hudson/main/test/")) { - // Inside the local repository. Hard to know exactly what that path might be, so just mask it out. - f = new FilePath(f.getChannel(), f.getRemote().replaceFirst("^.+(?=[/\\\\]org[/\\\\]jvnet[/\\\\]hudson[/\\\\]main[/\\\\]test[/\\\\])", "…")); - } - m.put(e.getKey(), f); - } else { - throw new IOException("no such file " + f); - } - } - archivings.put(name, m); - } - @Override public boolean delete() throws IOException, InterruptedException { - throw new IOException(); - } - @Override public VirtualFile root() { - throw new UnsupportedOperationException(); - } - } - - /* - @Test public void parallelMultiModMavenWsExists() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setAggregatorStyleBuild(false); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimod.zip"))); - assertBuildStatusSuccess(m.scheduleBuild2(0).get()); - - for (MavenModule mod : m.sortedActiveModules) { - while (mod.getLastBuild() == null) { - Thread.sleep(500); - } - - while (mod.getLastBuild().isBuilding()) { - Thread.sleep(500); - } - - assertBuildStatusSuccess(mod.getLastBuild()); - } - - - - } - - @Test public void privateRepoParallelMultiModMavenWsExists() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setAggregatorStyleBuild(false); - m.setUsePrivateRepository(true); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimod.zip"))); - assertBuildStatusSuccess(m.scheduleBuild2(0).get()); - - for (MavenModule mod : m.sortedActiveModules) { - while (mod.getLastBuild() == null) { - Thread.sleep(500); - } - - while (mod.getLastBuild().isBuilding()) { - Thread.sleep(500); - } - - assertBuildStatusSuccess(mod.getLastBuild()); - } - - } - */ - private static class TestReporter extends MavenReporter { - @Override - public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { - assertNotNull(build.getProject().getWorkspace()); - assertNotNull(build.getWorkspace()); - return true; - } - } - - private static class DummyRedeployPublisher extends RedeployPublisher { - public DummyRedeployPublisher() { - super("", "", false, false); - } - - @Override - public boolean perform(AbstractBuild build, Launcher launcher, - BuildListener listener) throws InterruptedException, - IOException { - return true; - } - } -} diff --git a/test/src/test/java/hudson/maven/MavenMultiModuleTestIncremental.java b/test/src/test/java/hudson/maven/MavenMultiModuleTestIncremental.java deleted file mode 100755 index 2ebaee49c2..0000000000 --- a/test/src/test/java/hudson/maven/MavenMultiModuleTestIncremental.java +++ /dev/null @@ -1,70 +0,0 @@ -package hudson.maven; - -import hudson.Launcher; -import hudson.model.BuildListener; -import hudson.model.Result; -import hudson.tasks.Maven.MavenInstallation; - -import java.io.IOException; - -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.ExtractChangeLogSet; -import org.jvnet.hudson.test.ExtractResourceWithChangesSCM; -import org.jvnet.hudson.test.HudsonTestCase; - -/** - * @author Andrew Bayer - */ -public class MavenMultiModuleTestIncremental extends HudsonTestCase { - - @Bug(7684) - public void testRelRootPom() throws Exception { - configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet m = createMavenProject(); - m.setRootPOM("parent/pom.xml"); - m.getReporters().add(new TestReporter()); - m.setScm(new ExtractResourceWithChangesSCM(getClass().getResource("maven-multimod-rel-base.zip"), - getClass().getResource("maven-multimod-changes.zip"))); - - buildAndAssertSuccess(m); - - // Now run a second build with the changes. - m.setIncrementalBuild(true); - buildAndAssertSuccess(m); - - MavenModuleSetBuild pBuild = m.getLastBuild(); - ExtractChangeLogSet changeSet = (ExtractChangeLogSet) pBuild.getChangeSet(); - - assertFalse("ExtractChangeLogSet should not be empty.", changeSet.isEmptySet()); - - for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { - String parentModuleName = modBuild.getParent().getModuleName().toString(); - if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleA")) { - assertEquals("moduleA should have Result.NOT_BUILT", Result.NOT_BUILT, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleB")) { - assertEquals("moduleB should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - else if (parentModuleName.equals("org.jvnet.hudson.main.test.multimod:moduleC")) { - assertEquals("moduleC should have Result.SUCCESS", Result.SUCCESS, modBuild.getResult()); - } - } - - long summedModuleDuration = 0; - for (MavenBuild modBuild : pBuild.getModuleLastBuilds().values()) { - summedModuleDuration += modBuild.getDuration(); - } - assertTrue("duration of moduleset build should be greater-equal than sum of the module builds", - pBuild.getDuration() >= summedModuleDuration); - } - - private static class TestReporter extends MavenReporter { - private static final long serialVersionUID = 1L; - - @Override - public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { - assertNotNull(build.getWorkspace()); - return true; - } - } -} diff --git a/test/src/test/java/hudson/maven/MavenOptsTest.java b/test/src/test/java/hudson/maven/MavenOptsTest.java deleted file mode 100644 index a86bd1969a..0000000000 --- a/test/src/test/java/hudson/maven/MavenOptsTest.java +++ /dev/null @@ -1,127 +0,0 @@ -package hudson.maven; - -import hudson.maven.MavenModuleSet.DescriptorImpl; -import org.jvnet.hudson.test.HudsonTestCase; -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.ExtractResourceSCM; -import hudson.EnvVars; -import hudson.model.Result; -import hudson.tasks.Maven.MavenInstallation; - -/** - * @author Andrew Bayer - */ -public class MavenOptsTest extends HudsonTestCase { - DescriptorImpl d; - - @Override - protected void setUp() throws Exception { - super.setUp(); - d = jenkins.getDescriptorByType(DescriptorImpl.class); - } - - @Override - protected void tearDown() throws Exception { - d.setGlobalMavenOpts(null); - super.tearDown(); - } - - public void testEnvMavenOptsNoneInProject() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-opts-echo.zip"))); - m.setGoals("validate"); - m.setAssignedLabel(createSlave(new EnvVars("MAVEN_OPTS", "-Dhudson.mavenOpt.test=foo")).getSelfLabel()); - - buildAndAssertSuccess(m); - - assertLogContains("[hudson.mavenOpt.test=foo]", m.getLastBuild()); - } - - - public void testEnvMavenOptsOverriddenByProject() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-opts-echo.zip"))); - m.setGoals("validate"); - m.setMavenOpts("-Dhudson.mavenOpt.test=bar"); - m.setAssignedLabel(createSlave(new EnvVars("MAVEN_OPTS", "-Dhudson.mavenOpt.test=foo")).getSelfLabel()); - - buildAndAssertSuccess(m); - - assertLogContains("[hudson.mavenOpt.test=bar]", m.getLastBuild()); - } - - public void testEnvAndGlobalMavenOptsOverriddenByProject() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-opts-echo.zip"))); - m.setGoals("validate"); - d.setGlobalMavenOpts("-Dhudson.mavenOpt.test=bar"); - m.setAssignedLabel(createSlave(new EnvVars("MAVEN_OPTS", "-Dhudson.mavenOpt.test=foo")).getSelfLabel()); - m.setMavenOpts("-Dhudson.mavenOpt.test=baz"); - - buildAndAssertSuccess(m); - - assertLogContains("[hudson.mavenOpt.test=baz]", m.getLastBuild()); - } - - - public void testGlobalMavenOpts() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-opts-echo.zip"))); - m.setGoals("validate"); - d.setGlobalMavenOpts("-Dhudson.mavenOpt.test=bar"); - - buildAndAssertSuccess(m); - - assertLogContains("[hudson.mavenOpt.test=bar]", m.getLastBuild()); - } - - public void testGlobalMavenOptsOverridenByProject() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-opts-echo.zip"))); - m.setGoals("validate"); - d.setGlobalMavenOpts("-Dhudson.mavenOpt.test=bar"); - m.setMavenOpts("-Dhudson.mavenOpt.test=foo"); - - buildAndAssertSuccess(m); - - assertLogContains("[hudson.mavenOpt.test=foo]", m.getLastBuild()); - } - - @Bug(5651) - public void testNewlinesInOptsRemoved() throws Exception { - configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet m = createMavenProject(); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-surefire-unstable.zip"))); - m.setMavenOpts("-XX:MaxPermSize=512m\r\n-Xms128m\r\n-Xmx512m"); - m.setGoals("install"); - - assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); - MavenModuleSetBuild pBuild = m.getLastBuild(); - - assertEquals("Parent build should have Result.UNSTABLE", Result.UNSTABLE, pBuild.getResult()); - - } - - /** - * Makes sure that environment variables in MAVEN_OPTS are properly expanded. - */ - public void testEnvironmentVariableExpansion() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setMavenOpts("$FOO"); - m.setScm(new ExtractResourceSCM(getClass().getResource("maven-opts-echo.zip"))); - m.setGoals("validate"); - m.setAssignedLabel(createSlave(new EnvVars("FOO", "-Dhudson.mavenOpt.test=foo -Dhudson.mavenOpt.test2=bar")).getSelfLabel()); - - buildAndAssertSuccess(m); - - assertLogContains("[hudson.mavenOpt.test=foo]", m.getLastBuild()); - } - -} - diff --git a/test/src/test/java/hudson/maven/MavenProjectTest.java b/test/src/test/java/hudson/maven/MavenProjectTest.java deleted file mode 100644 index 0fbfd3ead3..0000000000 --- a/test/src/test/java/hudson/maven/MavenProjectTest.java +++ /dev/null @@ -1,242 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2010, Sun Microsystems, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package hudson.maven; - -import hudson.maven.local_repo.DefaultLocalRepositoryLocator; -import hudson.maven.local_repo.PerJobLocalRepositoryLocator; -import hudson.model.AbstractProject; -import hudson.model.Item; -import hudson.model.Result; -import hudson.tasks.Maven.MavenInstallation; -import hudson.tasks.Shell; - -import java.io.File; - -import jenkins.model.Jenkins; -import jenkins.mvn.DefaultGlobalSettingsProvider; -import jenkins.mvn.DefaultSettingsProvider; -import jenkins.mvn.FilePathGlobalSettingsProvider; -import jenkins.mvn.FilePathSettingsProvider; -import jenkins.mvn.GlobalMavenConfig; - -import org.junit.Assert; -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.HudsonTestCase; - -import java.net.HttpURLConnection; - -/** - * @author huybrechts - */ -public class MavenProjectTest extends HudsonTestCase { - - - public void testOnMaster() throws Exception { - MavenModuleSet project = createSimpleProject(); - project.setGoals("validate"); - - buildAndAssertSuccess(project); - } - - @Bug(16499) - public void testCopyFromExistingMavenProject() throws Exception { - MavenModuleSet project = createSimpleProject(); - project.setGoals("abcdefg"); - project.save(); - - MavenModuleSet copy = (MavenModuleSet) Jenkins.getInstance().copy((AbstractProject)project, "copy" + System.currentTimeMillis()); - assertNotNull("Copied project must not be null", copy); - assertEquals(project.getGoals(), copy.getGoals()); - } - - private MavenModuleSet createSimpleProject() throws Exception { - return createProject("/simple-projects.zip"); - } - - private MavenModuleSet createProject(final String scmResource) throws Exception { - MavenModuleSet project = createMavenProject(); - MavenInstallation mi = configureDefaultMaven(); - project.setScm(new ExtractResourceSCM(getClass().getResource( - scmResource))); - project.setMaven(mi.getName()); - project.setLocalRepository(new PerJobLocalRepositoryLocator()); - return project; - } - - public void testOnSlave() throws Exception { - MavenModuleSet project = createSimpleProject(); - project.setGoals("validate"); - project.setAssignedLabel(createSlave().getSelfLabel()); - - buildAndAssertSuccess(project); - } - - /** - * Check if the generated site is linked correctly. - */ - @Bug(3497) - public void testSiteBuild() throws Exception { - MavenModuleSet project = createSimpleProject(); - project.setGoals("site"); - - buildAndAssertSuccess(project); - - // this should succeed - HudsonTestCase.WebClient wc = new WebClient(); - wc.getPage(project,"site"); - wc.assertFails(project.getUrl() + "site/no-such-file", HttpURLConnection.HTTP_NOT_FOUND); - } - - /** - * Check if the generated site is linked correctly for multi module projects. - */ - public void testMultiModuleSiteBuild() throws Exception { - MavenModuleSet project = createProject("maven-multimodule-site.zip"); - project.setGoals("site"); - - buildAndAssertSuccess(project); - - // this should succeed - HudsonTestCase.WebClient wc = new WebClient(); - wc.getPage(project, "site"); - wc.getPage(project, "site/core"); - wc.getPage(project, "site/client"); - - //@Bug(7577): check that site generation succeeds also if only a single module is build - MavenModule coreModule = project.getModule("mmtest:core"); - Assert.assertEquals("site", coreModule.getGoals()); - buildAndAssertSuccess(coreModule); - wc.getPage(project, "site/core"); - } - - /** - * Check if the the site goal will work when run from a slave. - */ - @Bug(5943) - public void testMultiModuleSiteBuildOnSlave() throws Exception { - MavenModuleSet project = createProject("maven-multimodule-site.zip"); - project.setGoals("site"); - project.setAssignedLabel(createSlave().getSelfLabel()); - - buildAndAssertSuccess(project); - - // this should succeed - HudsonTestCase.WebClient wc = new WebClient(); - wc.getPage(project, "site"); - wc.getPage(project, "site/core"); - wc.getPage(project, "site/client"); - } - - @Bug(6779) - public void testDeleteSetBuildDeletesModuleBuilds() throws Exception { - MavenModuleSet project = createProject("maven-multimod.zip"); - project.setLocalRepository(new DefaultLocalRepositoryLocator()); - project.setGoals("install"); - buildAndAssertSuccess(project); - buildAndAssertSuccess(project.getModule("org.jvnet.hudson.main.test.multimod:moduleB")); - buildAndAssertSuccess(project); - assertEquals(2, project.getBuilds().size()); // Module build does not add a ModuleSetBuild - project.getFirstBuild().delete(); - // A#1, B#1 and B#2 should all be deleted too - assertEquals(1, project.getModule("org.jvnet.hudson.main.test.multimod:moduleA").getBuilds().size()); - assertEquals(1, project.getModule("org.jvnet.hudson.main.test.multimod:moduleB").getBuilds().size()); - } - @Bug(7261) - public void testAbsolutePathPom() throws Exception { - File pom = new File(this.getClass().getResource("test-pom-7162.xml").toURI()); - MavenModuleSet project = createMavenProject(); - MavenInstallation mi = configureDefaultMaven(); - project.setMaven(mi.getName()); - project.setRootPOM(pom.getAbsolutePath()); - project.setGoals("install"); - buildAndAssertSuccess(project); - } - - @Bug(17177) - public void testCorrectResultInPostStepAfterFailedPreBuildStep() throws Exception { - MavenModuleSet p = createSimpleProject(); - MavenInstallation mi = configureDefaultMaven(); - p.setMaven(mi.getName()); - p.setGoals("initialize"); - - Shell pre = new Shell("exit 1"); // must fail to simulate scenario! - p.getPrebuilders().add(pre); - ResultExposingBuilder resultExposer = new ResultExposingBuilder(); - p.getPostbuilders().add(resultExposer); - - assertBuildStatus(Result.FAILURE, p.scheduleBuild2(0).get()); - assertEquals("The result passed to the post build step was not the one from the pre build step", Result.FAILURE, resultExposer.getResult()); - } - - - /** - * Config roundtrip test around pre/post build step - */ - public void testConfigRoundtrip() throws Exception { - MavenModuleSet m = createMavenProject(); - Shell b1 = new Shell("1"); - Shell b2 = new Shell("2"); - m.getPrebuilders().add(b1); - m.getPostbuilders().add(b2); - configRoundtrip((Item)m); - - assertEquals(1, m.getPrebuilders().size()); - assertNotSame(b1,m.getPrebuilders().get(Shell.class)); - assertEquals("1",m.getPrebuilders().get(Shell.class).getCommand()); - - assertEquals(1, m.getPostbuilders().size()); - assertNotSame(b2,m.getPostbuilders().get(Shell.class)); - assertEquals("2",m.getPostbuilders().get(Shell.class).getCommand()); - - for (Result r : new Result[]{Result.SUCCESS, Result.UNSTABLE, Result.FAILURE}) { - m.setRunPostStepsIfResult(r); - configRoundtrip((Item)m); - assertEquals(r,m.getRunPostStepsIfResult()); - } - } - - - public void testDefaultSettingsProvider() throws Exception { - { - MavenModuleSet m = createMavenProject(); - - assertNotNull(m); - assertEquals(DefaultSettingsProvider.class, m.getSettings().getClass()); - assertEquals(DefaultGlobalSettingsProvider.class, m.getGlobalSettings().getClass()); - } - - { - GlobalMavenConfig globalMavenConfig = GlobalMavenConfig.get(); - assertNotNull("No global Maven Config available", globalMavenConfig); - globalMavenConfig.setSettingsProvider(new FilePathSettingsProvider("/tmp/settigns.xml")); - globalMavenConfig.setGlobalSettingsProvider(new FilePathGlobalSettingsProvider("/tmp/global-settigns.xml")); - - MavenModuleSet m = createMavenProject(); - assertEquals(FilePathSettingsProvider.class, m.getSettings().getClass()); - assertEquals("/tmp/settigns.xml", ((FilePathSettingsProvider)m.getSettings()).getPath()); - assertEquals("/tmp/global-settigns.xml", ((FilePathGlobalSettingsProvider)m.getGlobalSettings()).getPath()); - } - } -} diff --git a/test/src/test/java/hudson/maven/MavenSnapshotTriggerTest.java b/test/src/test/java/hudson/maven/MavenSnapshotTriggerTest.java deleted file mode 100644 index b898e29b18..0000000000 --- a/test/src/test/java/hudson/maven/MavenSnapshotTriggerTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package hudson.maven; - -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.HudsonTestCase; - -/** - * Tests that Maven jobs are triggered, when snapshot dependencies of them were build. - * - * @author Andrew Bayer - */ -public class MavenSnapshotTriggerTest extends HudsonTestCase { - /** - * Verifies dependency build ordering of SNAPSHOT dependency. - * Note - has to build the projects once each first in order to get dependency info. - */ - public void testSnapshotDependencyBuildTrigger() throws Exception { - - configureDefaultMaven(); - MavenModuleSet projA = createMavenProject("snap-dep-test-up"); - projA.setGoals("clean install"); - projA.setScm(new ExtractResourceSCM(getClass().getResource("maven-dep-test-A.zip"))); - MavenModuleSet projB = createMavenProject("snap-dep-test-down"); - projB.setGoals("clean install"); - projB.setIgnoreUpstremChanges(false); - projB.setQuietPeriod(0); - projB.setScm(new ExtractResourceSCM(getClass().getResource("maven-dep-test-B.zip"))); - - buildAndAssertSuccess(projA); - buildAndAssertSuccess(projB); - - projA.setScm(new ExtractResourceSCM(getClass().getResource("maven-dep-test-A-changed.zip"))); - buildAndAssertSuccess(projA); - - // at this point runB2 should be in the queue, so wait until that completes. - waitUntilNoActivityUpTo(90*1000); - assertEquals("Expected most recent build of second project to be #2", 2, projB.getLastBuild().getNumber()); - } - - /** - * Verifies dependency build ordering of multiple SNAPSHOT dependencies. - * Note - has to build the projects once each first in order to get dependency info. - * B depends on A, C depends on A and B. Build order should be A->B->C. - */ - public void testMixedTransitiveSnapshotTrigger() throws Exception { - configureDefaultMaven(); - - MavenModuleSet projA = createMavenProject("snap-dep-test-up"); - projA.setGoals("clean install"); - projA.setScm(new ExtractResourceSCM(getClass().getResource("maven-dep-test-A.zip"))); - - MavenModuleSet projB = createMavenProject("snap-dep-test-mid"); - projB.setGoals("clean install"); - projB.setIgnoreUpstremChanges(false); - projB.setQuietPeriod(0); - projB.setScm(new ExtractResourceSCM(getClass().getResource("maven-dep-test-B.zip"))); - - MavenModuleSet projC = createMavenProject("snap-dep-test-down"); - projC.setGoals("clean install"); - projC.setIgnoreUpstremChanges(false); - projC.setQuietPeriod(0); - projC.setScm(new ExtractResourceSCM(getClass().getResource("maven-dep-test-C.zip"))); - - buildAndAssertSuccess(projA); - buildAndAssertSuccess(projB); - buildAndAssertSuccess(projC); - - projA.setScm(new ExtractResourceSCM(getClass().getResource("maven-dep-test-A-changed.zip"))); - - buildAndAssertSuccess(projA); - - waitUntilNoActivityUpTo(90*1000); // wait until dependency build trickles down - assertEquals("Expected most recent build of second project to be #2", 2, projB.getLastBuild().getNumber()); - assertEquals("Expected most recent build of third project to be #2", 2, projC.getLastBuild().getNumber()); - } -} diff --git a/test/src/test/java/hudson/maven/ModuleDependencyLocator.java b/test/src/test/java/hudson/maven/ModuleDependencyLocator.java deleted file mode 100644 index 88f3620e4a..0000000000 --- a/test/src/test/java/hudson/maven/ModuleDependencyLocator.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package hudson.maven; - -import hudson.ExtensionPoint; -import hudson.ExtensionList; -import hudson.Extension; -import jenkins.model.Jenkins; -import org.apache.maven.project.MavenProject; - -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; - -/** - * Extension point in Hudson to find additional dependencies from {@link MavenProject}. - * - *

- * Maven plugin configurations often have additional configuration entries to specify - * artifacts that a build depends on. Plugins can contribute an implementation of - * this interface to find such hidden dependencies. - * - *

- * To register implementations, put {@link Extension} on your subclass. - * - * @author Kohsuke Kawaguchi - * @since 1.264 - * @see HUDSON-2685 - */ -public abstract class ModuleDependencyLocator implements ExtensionPoint { - /** - * Discovers hidden dependencies. - * - * @param project - * In memory representation of Maven project, from which the hidden dependencies will be extracted. - * Never null. - * @param pomInfo - * Partially filled {@link PomInfo} object. Dependencies returned from this method will be - * added to this object by the caller. - */ - public abstract Collection find(MavenProject project, PomInfo pomInfo); - - /** - * Returns all the registered {@link ModuleDependencyLocator} descriptors. - */ - public static ExtensionList all() { - return Jenkins.getInstance().getExtensionList(ModuleDependencyLocator.class); - } - - /** - * Facade of {@link ModuleDependencyLocator}. - */ - /*package*/ static class ModuleDependencyLocatorFacade extends ModuleDependencyLocator { - @Override - public Collection find(MavenProject project, PomInfo pomInfo) { - Set r = new HashSet(); - for (ModuleDependencyLocator m : all()) - r.addAll(m.find(project,pomInfo)); - return r; - } - } -} diff --git a/test/src/test/java/hudson/maven/PlexusModuleContributorTest.java b/test/src/test/java/hudson/maven/PlexusModuleContributorTest.java deleted file mode 100644 index 9c893fe446..0000000000 --- a/test/src/test/java/hudson/maven/PlexusModuleContributorTest.java +++ /dev/null @@ -1,73 +0,0 @@ -package hudson.maven; - -import hudson.FilePath; -import hudson.model.AbstractBuild; -import hudson.remoting.Which; -import hudson.slaves.DumbSlave; -import hudson.tasks.Maven.MavenInstallation; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.SingleFileSCM; -import org.jvnet.hudson.test.TestExtension; -import test.BogusPlexusComponent; - -import java.io.File; -import java.io.IOException; - -/** - * @author Kohsuke Kawaguchi - */ -public class PlexusModuleContributorTest { - @Rule - public JenkinsRule j = new JenkinsRule(); - - - /** - * Tests the effect of PlexusModuleContributor by trying to parse a POM that uses a custom packaging - * that only exists inside our custom jar. - */ - @Test - public void testCustomPlexusComponent() throws Exception { - j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); - MavenModuleSet p = j.createMavenProject(); - p.setScm(new SingleFileSCM("pom.xml",getClass().getResource("custom-plexus-component.pom"))); - p.setGoals("clean"); - j.assertBuildStatusSuccess(p.scheduleBuild2(0)); - } - - @Test - public void testCustomPlexusComponent_Maven3() throws Exception { - j.configureDefaultMaven("apache-maven-3.0.1", MavenInstallation.MAVEN_30); - MavenModuleSet p = j.createMavenProject(); - p.setScm(new SingleFileSCM("pom.xml",getClass().getResource("custom-plexus-component.pom"))); - p.setGoals("clean"); - j.assertBuildStatusSuccess(p.scheduleBuild2(0)); - } - - @Test - public void testCustomPlexusComponent_Maven3_slave() throws Exception { - j.configureDefaultMaven("apache-maven-3.0.1", MavenInstallation.MAVEN_30); - DumbSlave s = j.createSlave(); - s.toComputer().connect(false).get(); - - MavenModuleSet p = j.createMavenProject(); - p.setAssignedLabel(s.getSelfLabel()); - - p.setScm(new SingleFileSCM("pom.xml",getClass().getResource("custom-plexus-component.pom"))); - p.setGoals("clean"); - j.assertBuildStatusSuccess(p.scheduleBuild2(0)); - } - - @TestExtension - public static class PlexusLoader extends PlexusModuleContributorFactory { - @Override - public PlexusModuleContributor createFor(AbstractBuild context) throws IOException, InterruptedException { - File bogusPlexusJar = Which.jarFile(BogusPlexusComponent.class); - final FilePath localJar = context.getBuiltOn().getRootPath().child("cache/bogusPlexus.jar"); - localJar.copyFrom(new FilePath(bogusPlexusJar)); - - return PlexusModuleContributor.of(localJar); - } - } -} diff --git a/test/src/test/java/hudson/maven/RedeployPublisherTest.java b/test/src/test/java/hudson/maven/RedeployPublisherTest.java deleted file mode 100644 index d1d46e8e59..0000000000 --- a/test/src/test/java/hudson/maven/RedeployPublisherTest.java +++ /dev/null @@ -1,256 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package hudson.maven; - -import hudson.model.Result; -import hudson.tasks.Maven.MavenInstallation; - -import org.apache.commons.lang.StringUtils; -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.SingleFileSCM; -import org.jvnet.hudson.test.Email; - -import java.io.File; -import java.io.FilenameFilter; -import java.util.Arrays; -import static org.junit.Assert.*; -import org.junit.Assume; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.jvnet.hudson.test.JenkinsRule; - -/** - * @author Kohsuke Kawaguchi - */ -public class RedeployPublisherTest { - - @Rule public JenkinsRule j = new JenkinsRule(); - @Rule public TemporaryFolder tmp = new TemporaryFolder(); - - @Bug(2593) - @Test - public void testBug2593() throws Exception { - Assume.assumeFalse("Not a v4.0.0 POM. for project org.jvnet.maven-antrun-extended-plugin:maven-antrun-extended-plugin at /home/jenkins/.m2/repository/org/jvnet/maven-antrun-extended-plugin/maven-antrun-extended-plugin/1.39/maven-antrun-extended-plugin-1.39.pom", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL"))); - j.configureDefaultMaven(); - MavenModuleSet m2 = j.createMavenProject(); - File repo = tmp.getRoot(); - - // a fake build - m2.setScm(new SingleFileSCM("pom.xml",getClass().getResource("big-artifact.pom"))); - m2.getPublishersList().add(new RedeployPublisher("",repo.toURI().toString(),true, false)); - - MavenModuleSetBuild b = m2.scheduleBuild2(0).get(); - j.assertBuildStatus(Result.SUCCESS, b); - - // TODO: confirm that the artifacts use a consistent timestamp - // TODO: we need to somehow introduce a large delay between deploy since timestamp is only second precision - // TODO: or maybe we could use a btrace like capability to count the # of invocations? - - System.out.println(repo); - } - - @Test - public void testConfigRoundtrip() throws Exception { - MavenModuleSet p = j.createMavenProject(); - RedeployPublisher rp = new RedeployPublisher("theId", "http://some.url/", true, true); - p.getPublishersList().add(rp); - j.submit(j.new WebClient().getPage(p,"configure").getFormByName("config")); - j.assertEqualBeans(rp,p.getPublishersList().get(RedeployPublisher.class),"id,url,uniqueVersion,evenIfUnstable"); - } - -// /** -// * Makes sure that the webdav wagon component we bundle is compatible. -// */ -// public void testWebDavDeployment() throws Exception { -// configureDefaultMaven(); -// MavenModuleSet m2 = createMavenProject(); -// -// // a fake build -// m2.setScm(new SingleFileSCM("pom.xml",getClass().getResource("big-artifact.pom"))); -// m2.getPublishersList().add(new RedeployPublisher("","dav:http://localhost/dav/",true)); -// -// MavenModuleSetBuild b = m2.scheduleBuild2(0).get(); -// assertBuildStatus(Result.SUCCESS, b); -// } - - /** - * Are we having a problem in handling file names with multiple extensions, like ".tar.gz"? - */ - @Email("http://www.nabble.com/tar.gz-becomes-.gz-after-Hudson-deployment-td25391364.html") - @Bug(3814) - @Test - public void testTarGz() throws Exception { - j.configureDefaultMaven(); - MavenModuleSet m2 = j.createMavenProject(); - File repo = tmp.getRoot(); - - // a fake build - m2.setScm(new SingleFileSCM("pom.xml",getClass().getResource("targz-artifact.pom"))); - m2.getPublishersList().add(new RedeployPublisher("",repo.toURI().toString(),false, false)); - - MavenModuleSetBuild b = m2.scheduleBuild2(0).get(); - j.assertBuildStatus(Result.SUCCESS, b); - - assertTrue("tar.gz doesn't exist",new File(repo,"test/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT-bin.tar.gz").exists()); - } - - @Test - public void testTarGzUniqueVersionTrue() throws Exception { - j.configureDefaultMaven(); - MavenModuleSet m2 = j.createMavenProject(); - File repo = tmp.getRoot(); - - // a fake build - m2.setScm(new SingleFileSCM("pom.xml",getClass().getResource("targz-artifact.pom"))); - m2.getPublishersList().add(new RedeployPublisher("",repo.toURI().toString(),true, false)); - - MavenModuleSetBuild b = m2.scheduleBuild2(0).get(); - j.assertBuildStatus(Result.SUCCESS, b); - - File artifactDir = new File(repo,"test/test/0.1-SNAPSHOT/"); - String[] files = artifactDir.list( new FilenameFilter() - { - - public boolean accept( File dir, String name ) - { - System.out.print( "deployed file " + name ); - return name.contains( "-bin.tar.gz" ) || name.endsWith( ".jar" ) || name.endsWith( "-bin.zip" ); - } - }); - System.out.println("deployed files " + Arrays.asList( files )); - assertFalse("tar.gz doesn't exist",new File(repo,"test/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT-bin.tar.gz").exists()); - assertTrue("tar.gz doesn't exist",!files[0].contains( "SNAPSHOT" )); - for (String file : files) { - if (file.endsWith( "-bin.tar.gz" )) { - String ver = StringUtils.remove( file, "-bin.tar.gz" ); - ver = ver.substring( ver.length() - 1, ver.length() ); - assertEquals("-bin.tar.gz not ended with 1 , file " + file , "1", ver); - } - if (file.endsWith( ".jar" )) { - String ver = StringUtils.remove( file, ".jar" ); - ver = ver.substring( ver.length() - 1, ver.length() ); - assertEquals(".jar not ended with 1 , file " + file , "1", ver); - } - if (file.endsWith( "-bin.zip" )) { - String ver = StringUtils.remove( file, "-bin.zip" ); - ver = ver.substring( ver.length() - 1, ver.length() ); - assertEquals("-bin.zip not ended with 1 , file " + file , "1", ver); - } - } - - } - - @Test - public void testTarGzMaven3() throws Exception { - - MavenModuleSet m3 = j.createMavenProject(); - MavenInstallation mvn = j.configureMaven3(); - m3.setMaven( mvn.getName() ); - File repo = tmp.getRoot(); - // a fake build - m3.setScm(new SingleFileSCM("pom.xml",getClass().getResource("targz-artifact.pom"))); - m3.getPublishersList().add(new RedeployPublisher("",repo.toURI().toString(),false, false)); - - MavenModuleSetBuild b = m3.scheduleBuild2(0).get(); - j.assertBuildStatus(Result.SUCCESS, b); - - assertTrue( MavenUtil.maven3orLater( b.getMavenVersionUsed() ) ); - File artifactDir = new File(repo,"test/test/0.1-SNAPSHOT/"); - String[] files = artifactDir.list( new FilenameFilter() - { - - public boolean accept( File dir, String name ) - { - return name.endsWith( "tar.gz" ); - } - }); - assertFalse("tar.gz doesn't exist",new File(repo,"test/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT-bin.tar.gz").exists()); - assertTrue("tar.gz doesn't exist",!files[0].contains( "SNAPSHOT" )); - } - - @Test - public void testTarGzUniqueVersionTrueMaven3() throws Exception { - MavenModuleSet m3 = j.createMavenProject(); - MavenInstallation mvn = j.configureMaven3(); - m3.setMaven( mvn.getName() ); - File repo = tmp.getRoot(); - // a fake build - m3.setScm(new SingleFileSCM("pom.xml",getClass().getResource("targz-artifact.pom"))); - m3.getPublishersList().add(new RedeployPublisher("",repo.toURI().toString(),true, false)); - - MavenModuleSetBuild b = m3.scheduleBuild2(0).get(); - j.assertBuildStatus(Result.SUCCESS, b); - - assertTrue( MavenUtil.maven3orLater( b.getMavenVersionUsed() ) ); - - File artifactDir = new File(repo,"test/test/0.1-SNAPSHOT/"); - String[] files = artifactDir.list( new FilenameFilter() - { - - public boolean accept( File dir, String name ) - { - return name.contains( "-bin.tar.gz" ) || name.endsWith( ".jar" ) || name.endsWith( "-bin.zip" ); - } - }); - System.out.println("deployed files " + Arrays.asList( files )); - assertFalse("tar.gz doesn't exist",new File(repo,"test/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT-bin.tar.gz").exists()); - assertTrue("tar.gz doesn't exist",!files[0].contains( "SNAPSHOT" )); - for (String file : files) { - if (file.endsWith( "-bin.tar.gz" )) { - String ver = StringUtils.remove( file, "-bin.tar.gz" ); - ver = ver.substring( ver.length() - 1, ver.length() ); - assertEquals("-bin.tar.gz not ended with 1 , file " + file , "1", ver); - } - if (file.endsWith( ".jar" )) { - String ver = StringUtils.remove( file, ".jar" ); - ver = ver.substring( ver.length() - 1, ver.length() ); - assertEquals(".jar not ended with 1 , file " + file , "1", ver); - } - if (file.endsWith( "-bin.zip" )) { - String ver = StringUtils.remove( file, "-bin.zip" ); - ver = ver.substring( ver.length() - 1, ver.length() ); - assertEquals("-bin.zip not ended with 1 , file " + file , "1", ver); - } - } - } - - @Bug(3773) - @Test - public void testDeployUnstable() throws Exception { - j.configureDefaultMaven(); - MavenModuleSet m2 = j.createMavenProject(); - File repo = tmp.getRoot(); - // a build with a failing unit tests - m2.setScm(new ExtractResourceSCM(getClass().getResource("maven-test-failure-findbugs.zip"))); - m2.getPublishersList().add(new RedeployPublisher("",repo.toURI().toString(),false, true)); - - MavenModuleSetBuild b = m2.scheduleBuild2(0).get(); - j.assertBuildStatus(Result.UNSTABLE, b); - - assertTrue("Artifact should have been published even when the build is unstable", - new File(repo,"test/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.jar").exists()); - } -} diff --git a/test/src/test/java/hudson/maven/ResultExposingBuilder.java b/test/src/test/java/hudson/maven/ResultExposingBuilder.java deleted file mode 100644 index 2bc74dd15d..0000000000 --- a/test/src/test/java/hudson/maven/ResultExposingBuilder.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2013, Dominik Bartholdi - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package hudson.maven; - -import hudson.Launcher; -import hudson.model.BuildListener; -import hudson.model.Result; -import hudson.model.AbstractBuild; -import hudson.tasks.Builder; - -import java.io.IOException; - -/** - * @author Dominik Bartholdi (imod) - */ -public class ResultExposingBuilder extends Builder { - private Result result; - - public ResultExposingBuilder() { - } - - @Override - public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { - result = build.getResult(); - return super.perform(build, launcher, listener); - } - - public Result getResult() { - return result; - } -} \ No newline at end of file diff --git a/test/src/test/java/hudson/maven/reporters/MavenMailerTest.java b/test/src/test/java/hudson/maven/reporters/MavenMailerTest.java deleted file mode 100644 index 3c1c727e12..0000000000 --- a/test/src/test/java/hudson/maven/reporters/MavenMailerTest.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2011, Dominik Bartholdi - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package hudson.maven.reporters; - -import hudson.maven.MavenModuleSet; -import hudson.model.Result; -import hudson.tasks.Mailer; -import hudson.tasks.Mailer.DescriptorImpl; - -import javax.mail.Address; -import javax.mail.internet.InternetAddress; - -import jenkins.model.Jenkins; - -import org.jvnet.hudson.test.Bug; -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.HudsonTestCase; -import org.jvnet.mock_javamail.Mailbox; - -/** - * - * @author imod (Dominik Bartholdi) - * - */ -public class MavenMailerTest extends HudsonTestCase { - - @Bug(5695) - public void testMulipleMails() throws Exception { - - // there is one module failing in the build, therefore we expect one mail for the failed module and one for the over all build status - final Mailbox inbox = runMailTest(true); - assertEquals(2, inbox.size()); - - } - - @Bug(5695) - public void testSingleMails() throws Exception { - - final Mailbox inbox = runMailTest(false); - assertEquals(1, inbox.size()); - - } - - public Mailbox runMailTest(boolean perModuleEamil) throws Exception { - - final DescriptorImpl mailDesc = Jenkins.getInstance().getDescriptorByType(Mailer.DescriptorImpl.class); - - // intentionally give the whole thin in a double quote - Mailer.descriptor().setAdminAddress("\"me \""); - - String recipient = "you "; - Mailbox yourInbox = Mailbox.get(new InternetAddress(recipient)); - yourInbox.clear(); - - configureDefaultMaven(); - MavenModuleSet mms = createMavenProject(); - mms.setGoals("test"); - mms.setScm(new ExtractResourceSCM(getClass().getResource("/hudson/maven/maven-multimodule-unit-failure.zip"))); - assertBuildStatus(Result.UNSTABLE, mms.scheduleBuild2(0).get()); - - MavenMailer m = new MavenMailer(); - m.recipients = recipient; - m.perModuleEmail = perModuleEamil; - mms.getReporters().add(m); - - mms.scheduleBuild2(0).get(); - - Address[] senders = yourInbox.get(0).getFrom(); - assertEquals(1, senders.length); - assertEquals("me ", senders[0].toString()); - - return yourInbox; - } - -} diff --git a/test/src/test/java/hudson/maven/reporters/MavenSiteArchiverTest.java b/test/src/test/java/hudson/maven/reporters/MavenSiteArchiverTest.java deleted file mode 100644 index 359fb4913e..0000000000 --- a/test/src/test/java/hudson/maven/reporters/MavenSiteArchiverTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package hudson.maven.reporters; - -import org.jvnet.hudson.test.HudsonTestCase; -import hudson.maven.MavenProjectTest; - -/** - * @author Kohsuke Kawaguchi - */ -public class MavenSiteArchiverTest extends HudsonTestCase { - /** - * Makes sure that the site archiving happens automatically. - * The actual test resides in {@link MavenProjectTest#testSiteBuild()} - */ - public void testSiteArchiving() throws Exception { - } -} diff --git a/test/src/test/java/hudson/maven/reporters/SurefireArchiverTest.java b/test/src/test/java/hudson/maven/reporters/SurefireArchiverTest.java deleted file mode 100644 index 7e3ae538ee..0000000000 --- a/test/src/test/java/hudson/maven/reporters/SurefireArchiverTest.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2010, InfraDNA, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package hudson.maven.reporters; - -import hudson.maven.MavenBuild; -import hudson.maven.MavenModuleSet; -import hudson.maven.MavenModuleSetBuild; -import hudson.maven.MavenProjectActionBuilder; -import hudson.maven.reporters.SurefireArchiver.FactoryImpl; -import hudson.model.Result; -import org.jvnet.hudson.test.ExtractResourceSCM; -import org.jvnet.hudson.test.HudsonTestCase; - -/** - * @author Kohsuke Kawaguchi - */ -public class SurefireArchiverTest extends HudsonTestCase { - public void testSerialization() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); - m.setScm(new ExtractResourceSCM(getClass().getResource("../maven-surefire-unstable.zip"))); - m.setGoals("install"); - - MavenModuleSetBuild b = m.scheduleBuild2(0).get(); - assertBuildStatus(Result.UNSTABLE, b); - - - MavenBuild mb = b.getModuleLastBuilds().values().iterator().next(); - boolean foundFactory=false,foundSurefire=false; - for (MavenProjectActionBuilder x : mb.getProjectActionBuilders()) { - if (x instanceof FactoryImpl) - foundFactory = true; - if (x instanceof SurefireArchiver) - foundSurefire = true; - } - - assertTrue(foundFactory); - assertFalse(foundSurefire); - } - -} diff --git a/test/src/test/resources/hudson/maven/HUDSON-4192.zip b/test/src/test/resources/hudson/maven/HUDSON-4192.zip deleted file mode 100644 index 24e286e883e6dadfd1ad92dd5e44fec0e9486672..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2117 zcmWIWW@Zs#U|`^2Ff8S<-lK5%gFGVxLm?9b13QB#LqUG7UPW$BXb2|*Gp~8GmnIO0 zRP) zhPJiWZ55^*I)8ZI483hC4-Z8sX>^+hn%q6n)Bb&u(CMW=+G9)nA2u$zKlh?!HG)7*vnm{=Blna$oWd_G3+3aw6aK^Sv&aeE(&~Lgl$DQo1@Pah{r4=)m#! zjKhW1?^xo+KbKrc4P0}(@}lWGF`K56srN3od6lj;nE%|QKvsQ5?W30~pXE=>uVV}V z1}qmaU>U#x3uZtG7GS^@7bWXs4OQIQIHB4~Qj1GS)ys#hH!HC$kyHbOF$}=(3`CMz zR8zW#516DXfJsUoyD5$Z1tCCB>46-EHBf2;5BeQ8;Mx0JyXKA7#d|kXGs^jLY8-G{0!kybG#*Zse8f4ITVQ9QL&c|kNgKlKWZ5n|7{8GCoGr${8uP<5 z<2J|U<-aDS2c8W*WVS$U-t*i!oU_hIZJfF3BwP($*k~w0=VLaNXj1KXv}G z@%kT5*fC&(a5)PRwx~r4a@YoAHx0FbA<~_wfwq|$;!bGRBGL@hKzomD1|@-J nz=Gr$A_EOIlOYFM8FteUSq{astZbkJ%mswcfr0J83gQ6(!{}fZ diff --git a/test/src/test/resources/hudson/maven/JENKINS-1557.zip b/test/src/test/resources/hudson/maven/JENKINS-1557.zip deleted file mode 100644 index 95a102f9f39f5b676e1e80dfe57dd730b8910ea0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3420 zcmWIWW@Zs#U|`^2;E&C+UdL>5qm_w)!IYhWft^8yp&&n3uOc@mG=!6ZS*=9z9UtcV+UM2; zd=h?p!CjJf!rS%n%k+b5OpdC2*L~q98erROHqSPnL&Ng0Q_#w(tKWCcSuLv8$8hlZxd9G8b|$v;Ul@@#PT5TC)X=hX2=2y?ml+SxzGC**Uj1DH0{K%T}v8mIrwHwDw$?* zd$n-r;v=kUwZnhqn)^L>eXg?Oe)RT3JI-%=k;Ax9VWQ=`o9kDJiN4SY;}I9kvO4>` zPWr3GzEV>FR@~!d&{SGg)VnoH2?USV{e2{ zRzBNtCfP|n$XoT{+ylu%{hc-we!fed>ptb5$LnR^cW&WKa`UTsZer;5EB&B-o#_cC z74h8b!k?~vDoL-GzBl_|s7Jn&wEVn3{~p9Yod5ov?bdwLC(+CP%JPM=@P^;(``uGE z=i#60LiYdm$Q$ju{nI`Gn2Nc8shEKwwJ6IP%zzRsz*JmZl&lXR- zxOHjmDN=eE$ zBGW(_+y*9NCJ%8u*z*OeW$iQGmoZ-Qlxdl0? zp?R4lA;1Ks2Z}&&x;)_Y(+h;r(&gITjeJc80&V3&_a3^%W<7e9awqlxyT)5i(HEwB z!&HuxZ&%%6x$92R{qOau50|`3?Ou=}vTNbujHJ_xx@Vo7cWRN&nHMM6D_pXhc2rwF za@i+tTC~IC*wn&}l08hO9%(Bk89vZ`IFqr4b<3=W+Eb2B5^eCUnsia%(r2%Q#@p7) zXeqbfwKMj%YiGVP_n|1$x!1-!LY&%8w)7=2_?~3Rd|s;L{r>*M&Ay^vqF?JzEU^P+ zBS`S{0E1_*o>k!{VDPvBgU6VZ;PFHa8x3H%fG|eb?Cv{cAmUQ({jXhfp`noO)vm1B zxewT7e&;25)U1t}-G1TU?^}W;Q%o+OnQ3`)*XFmJed>>`@6B5GC8_OE>tjFdwTGru zoU@oJvFYdBw=UuH&Oh^*^gS#iG3e#72M^q|o19~NzT9QFpd0+9Nqp^9XYB_k<1H$l zMExz0b9%$y8MEPW*4-JbEN0R&?F!s%nb*sgtWrE^`lQjj?fI_O-tSMBoc$NIN4WNA z)}o&;e|LDSmikY)l*vuZB%A=T7jv*u25bbiN*SNH zC*3$<6yw~HjYEzK(hcTAF?b5H!O&5#fI|)Y=Bo5_$|%O8rOL&zA9ZX z+hUu^?=M$xrL})-lyy|PX7G>8<0Y5<|B6G=Tgn2%JpWfrzk9Re;M)?bg_p(OZ-`u9 z{O9@0k4IfCHu!iX&wL`VTY97Mye^{$GJ^KCfhi>=$?bkS|KTL`Ho~k`_1+TV!teFLKzW&}>tY_H{ znNReRlW5z;_di(U`g-2CsQvIWo>;i+&gPxp zJ=|3+tR^*xTxig_?IQKc1}&II>D@I_u@cwR8u13HjVS*$NYK1c`q!; zs_2)R6DFnT?5(}r`G@M|{{g@xzy(YK3=C&ulAXW|D8T|u0>wqi`r!Ci)G!XL$Bci3 z?n!96Iib396EpK5Mr>9$4txQ`Xh{gS5q!u-WF?j*BFs6A-5f|-207)WTwGv0&?ALF zEQMi?YeiyiK~Ab3$WXBNKyJfg=3^}l-%}@j!aUA->ga_Pto1mfd%`nx#j_v=rWGND zo=Kb&v`(M*2|VF@=FDXdJSD{8LPe&i zJxx*5R(Y->Cazu4){r6+r0o^-IjBoC;gra#ojXJt7*=i5u{UPTX>3yqaAV{;&;yMY zMkYCCT;-w!IFNzGB*T_Q5EEWXvO-EpG&cu$gABu!!ytw+FbFXGb!28@faW)#Nud0O z$0W?$hHR1})Ff!$0~!ZP-y|5v$AD~H3$k(0l!VVrT)7ZA8w|n*>Pr& zwJ!R9Pc`*o(8NX8<9G_o%F3qgHrZ!)O6_*>>z1(9HDO_u$3!o04Y(cp@5hIQ5l^nO zNUx5!{46Md?*9LErv2>|Y)q>E8e$vz^x{>^ohOWRO3%*D zuRX59m0)s^DKon?+wN*hX5=ZpI^Iy(4C$V>fCYiCk8-EV^=;Bls$gL~_A=|_o|^a^ zyZd+Y?e5toY>}TD6jHQ_FKn~^+64Pez3jbjjyXy1GnQF=g5%08>2+B%`XA^qB(Heg zIPv@SFi!iA(ub9s)sI~%QsHIOKkaHc|3`1)@huOJ6tmy_TmGKS_ifKP_2Y??dD^R1 zGU}_G2*^CKd;VXR`Oz1zq#mkIEP3W~aUz=ri^j4!EV|{pw&rLUII$_j%-*o!{H?Mh zk!;;cB3_jbtX$7a>M#0u=g?+_d)o}Ae6G}JURHYU`M%;QK2D|2*H+{mZd$)`QMBI9 zPbc?Z^y^uj95|Wnp7Z9*=foBDRvz-0b6nJ1C1{g~+%`3#sM`}R8+&@4cHKHd@o4{A zXCG~Tu>dW;>D=vY!R+!9t$(guy&_-MCAIzXzt{E2H3eVVKX31CE8K6%7qNCn_QU!8 zF@M+sfC-BWn6MZa&aNx412dom3ov077bWY1Q&p34qwhQ*MoU!)-S5zJb3%2Oq!yPz zjMxv1WZjVC?IGuq;vrJ{l{*1OG!oshE`w+p+khpjs*oFz*y1)1u;CbK@pA?*|mWO z{SF)O?0v3X^G0jpy_cyO<$O6c4%c?6=J+l;lIWB1zi;w3o?at)nUn8-?hU`b^4Wr_ zmScQH7RBYK<}58*C+5U|uBz#KhRMlus~P>T$v@#^zWV(@FIUC%4ZX8wD6ZNh5^zY{ zxS@h??pJ||j~ySL%t_fGr1!3WSL3r4P9B$47?^f^n0#RiW19cRsmCKtLpi1Uy98eF zy8l(%=$5l=&D=*hl6B8|5`s40edIUwzUBpyr4723xxZE)(%O7XXQflgi|+V}xeL2@ z`0oDZadCEz?4`~kzBuj;$8R#-UTV-N@^NzhB9pfr6#nz4Dd``FW!(4sDf+v% zU%YK`PfAWc%v;fJOMW?2t143Zo`h9z!$EG7jsQ3Z&l zu^R@;qvE@zvGyJfpkfsTNSgNtBTR;db<#2g|`=x1;9Z z&G^Cq-5gjBMwo+=gGn+AmV;5vqE-&ZWh!Yo_;%KeV?Ds=+5*HH$WaCkLy+GQ?gg0) z%)tb6uWs)~zGed+m-70fQ&$?a@F%>wHg}=((FbfTi`0%NEfih#4ov@iJeKls_2 zZ(Zx$6U^sce0J0K@m}Wh$xb^DyFXc8=3B|3rgyWW=w|jJi>mzU{Kic;U-p{)VhZqP zWRhdX)t-?6`kH|OSb#AsX#}z0ts7QI>jte@f*6LY4ucrRz#zcz)-e)TAVO+1ph;K? zIAoJB>oa7NrbA7F)^0%KK(!kQ4&!4$HtrU(anO81*om0A1ldd_V9O8WS+En~=_WLU zbaQ1;+?t2gTts>##|8xy8;%gL0g{*S`2$y72nioZ%93Nj7Cs1nK=Tz+&4|xNNbEqU{(dl#yvnb4!L3gx)W4}V>K98wSXKlx@<`9L>P>y zB=A{)Js+Yb_c_QGP${`T!7vk2MG%fO^lXHh+zr@~0t23n5Xpq{D1*vU0fz0s)OU^p!~+1>SwWuw diff --git a/test/src/test/resources/hudson/maven/JENKINS-9326.zip b/test/src/test/resources/hudson/maven/JENKINS-9326.zip deleted file mode 100644 index a9b50b23ae9b516ccdf022681c0d75665101bf9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12849 zcmds7cRZEh+ZV~+BP%m293!$aGmnw%k+S#RC6sZHjFe4e?~sv@tYl5&d_Jc`p6h$x*Y$kw>$<3p247| z4&Nj9hCl5r2Ct&ioHAyPSfvL`Dy1|%BiU9UdHidviLMrm1I-yOh!Mrz-O zY`}Ai$sHyfz@sW$6coB6d~kBK2YK1sebgRz?B^l$l^_1DrsZ8U=0PH@5vz#F!eEbD zddn-Rb}EsISaeX;&uaL4SBpgSQ&V#ibM7hj&27=~G0$hsZA1BIFmTiom7GPAqgI?y z81D(6Y?)i`*w~(Zwah8z6*B<#4erE^0qSH(j@h^l373(9iIvmu48bN7+P}` z1bSo}kQMr`k3vq>+IuCimIv*8GQ*=NW zBWf;QnZv%aeHy(XYJL(6X_7N+(LMs;R~RH`&$wVnsXg(+b*A{jB1> zi5+TH&o}KSF6Qf$V2Fr5c)&B@&{*flukosG@oFjnX2pj_pN@5S0iA|p~8cH-ln^`wH~^2`}h z#%sHK--$cSYcJ**q3Z>-Y#DoncshMIcYg1~*Bi_{Al@paj6--+`WEYCv+j+g%L>|0 zCkQ4M6}T!FRlUE{hL!n+d^-6l*>q%YvC8s9V5K|7>ogF)S6kzPnUP9oXJ)=!l4)rw zmFJxjR4ygAQi(L9X3{H|c@t0Z)~dgwp;y!D`MgULouIR-;r%=oW8;`J!;I}@H^vtK z-fwfs^_>ru?j<(1<+C4>Muxf_EqN;HYXif;o=eS}R}arPCy}lrH*;4vxCBz=5-qL> z-mUBcZgxI~g2HgP5y;fe*wxj^*v%>?N<|5cmk`qZMTfK6^Uam!CWo+>*yM$M#aEbB zAd6PX&5G&^^;N0m>uR(17GBfuKNiXPNfhg*%dB25I5wJ(I^?A^`ubCy&!_Q%-Vzq-D0su#&s%$ZeVK^Lk^lK>$?)IYklt|V3`OSjO+TJ!e)RVgrFXliGD=zAeq)hcY}dY zyy*VI-u_NyeVSp+|F)oPuDE2P^4t5bPAiwSw0f4+WQB2Msm-#F3$Cg7PDSeP?RY#x z1A`{guagqIrs+98U!tcue${dF;_I>pc?!ljEcMcSQzp|+Vl^7MVgt9RO0kTK6wMU$ z+SIuWNop}VE21+dCw((C%aaq`XY^}s8x7w19MsA`tR7$Tyd1TbbmHCvLV&}t8``=22RQ&hAiy_K z;QMDSgq20meu#gWL;qrKYG>`_Y7Vk7a|4+=x|jnGz}&($CPE6kk%v@f^8w?8I0X^e zLmaY`*#2oJLl(h+Z9VGwH;v z@MOQhnvTvOQ09AcNH(vNt*n2%wTS&`gbW>nFu|8BDU4p#S`r#Q!EXOeU8#lF8I&(i zcHn=UvbScsV7~s9l_J`+GVYX<>YX~Jo^zHZ3)BkEMQ9vRchQVrihT{8_L`AjM*p2+ z6{LxIc7Werz~`U+cQP}F^Pj5?>OUcRkB=(vgt$;v8tGF)XLii%$HME0DOsGe*=er^ zK3g0~4(oeJwesKzoe1sDsZ$rW-#lF{Vj`f-W98q9K3zTg@*&vUyiWHT(<`EJ z${jkooEjnjhA_?$$i)tbe1DEn-4Pt1Kl~x8$ZAS)DXPlBQD78cP_Ue+bP`~N0#JbC zFRWFhR2Ai9H8epga$2umVf#yxqEFOaWcY0PGK5?%NisBzoN`gVu08Ob(wcmoPeA|r zWASm}88)>qX?QjMebFTfuFn)a$ZLpnaV3WMSXgvzh{Hv;~`7uX%CZiGfNkx)tsC%&jeul&1k;fL$^F<+YXa43 zzwWrJsa$N7B=iYWDAmpjp`-VmkX<$+c|<{M(ySB^N=O`uQ~c!k@SwxDt5=$>CJC11 zDJ^k^Wj;9YIa+v3zgpPcy5WQ2bo&AtJ0zM8H$`-OY3=zXMom?YFEvwC3TFqI_Fks& zZbG`W{7#>^&EU!+mPdt)^IAWW!RPZhHVKYySxE@)g|3(fR`U0rVLq*uAjiG-mTuWO z5<|Up%}jr+BkJM8UcFR`v0e@+$Yu>|gY*&8#kSDdHZ@|!{rtKYH;dchmUhq5 z?mHz0rhTRv3w*oxUMz%z18#3YjKB)szh>4CR=B!byP3nK03iVGUBnfA9)KI4fRE&V z0|(`X1{8RoAVF#!;0wHjVsjd{_O?C`G1Un#ojftBeVpA*i_|U;N2mJjVD>0Wl>GOO zn2AP$<&5UGjZ$_KRLd?i7FO1^y_KC46R4tEq!jq!Da)*;#KzTeU9KnZ$K8-|qtGK` zhP+YcJl-AnV0pxhMWb7-T2p_U12Wk*7yoeJY-AaPQG1>(qp^pEjmxp|{9TXJ(aL<~ z7%XH%y1Ha*OHI+KXIgtGznW%rs8J^xX$zO=ZSSf2MBROjAw@`vF0rg) zlIY%hj$LtBrTP13`)Gl&?1_=Cw(8B~WVb1k{sG1A3L-G5kFvc#P$?VCP$0Xr?iG`g zbFziVy5jmwCreta#ogjU`xy$s@)_dZ*fKJCu+G-rXY$mCG?iW-ZoxHv?kYh7p1~ev1=BpU^I~A)_;_mhaW*-w=AB@})!;@FJ-;uB_0v|S?d2#qeYw$Z zyZ8En3?!HDyQat5fEJfYP+n_uvOj)n{{EUj6B&PuwjmDYjb8OU!F()_(cIalorEe} z9vYh~P43>l7Z>v-F5Puc3f(; z2de{%c1!KpZW`GQY;?;CE4*%qn4W>Br2qVv!O-BSk+ADQ&TJ+Go=-*g%2MsJ_=07( z>)sCfZte-k ziySDtQ<$$>MVXV;V)1lV%Ii&yx8Tcf>!q19Ki$aBZ+eBx({vKH7y5_Vfy`lKwc~Mb z8r@4EZpJ{CkodRw?Zd%p2Q-N85lS{_yttB^C&r~ZNN>B|w8IXfP2+MaN?<$dAQoLZ zCCygteadoJUAmTVwZFf$=FSHU)#K{fPK1;t$C)b91gI8k*FYe>+lE*d#r*8&KBul- z5!PpmNdS8ledVp3u^h?j-tgYD^H8M!~>3gO~L*$b!WE|6kEV<3P#itNsq~KLFT-QX!AS&(3IF zbOSaj1F7uW4Km){at|&$|Jxq2YCbpTZ24Z~XzMJ=PNGY!Jte^VdhWU5 zCFcBkz2ViiO003lqT^*#x%d-J>yFLgLjKbdYbMK2CIhi!0yOQ{IlK(DgBrE!D62Pi zX8pYIZqSCVMwqUT2|h)Itw?B8fI$4Z4q?YH{rx+y(x2QHIFRq>0F0lh5=glRU2V`W zOXz?8m2xLSQ0|K8j*jSt27*mIodJSkvX_!%%(dG&-&j;U=pJzJtIprJbmltJ2smIfSvpPu5yDrDi1ioR6pKbRzcHkv#3RQu3K zpB$up_TxpK(@P8VqLaxK7;$O#T}HzEQIq-@+Vo8FjZxx&avxk{+WHZ+{Wdi;X!a#u z76;1xUtB**w7cC7Q=gS?&Z3`1=idXH#WyEpd)*+~sdV%NfrD+D(N=t?j2A>j9uy0H z68$OKJE5YT3=r+j2cn&eXdHcqE_M2cXfOOF+H2rSFXBT-DoMGK=yj-J5^jh|A@Hmj zfrN{+dcq9hq`F~515~QZZu$m2@$B&@mkUD;@RueYmTm7>$_-2P0w@=(@MI{B1BB zY^A2KhLzM;uU{Vti3F8!c)3HaY}Ju9KVEL@_h1WB$C1`^%|qSAq?+v67-|<85Ip@+ zE-F^-24^Yz@s7MIU-}qZF&hV(RIY>>T}RmJP(oN8SLW2zZofgCxsuYE|-8da#8r~ zOy^ejcxwGIJClAX|A(AfZ^!SIk+6N&%59NK%W{b_Vf&1MacdkWz4&|Oa|_dx(j~X}^eG_Q4bp>niDqHtre0y3aGSVh;8r=511+XH?XDvFI{(o>{x- z^`q=qvtxiKVDy*ij4K( z>Fe21*=A#qFp)Q>3W-|Qv_e`<&p)I=bA25aqO^D!yFhR}!Ty*E(;F8_d#jFz*xRu@ zB#EhaOq-_YBQm436Ju?MmFdpPimRk7(4^cLrd*t>An_V+Q#5*D2LXk1MQz9(V@sFu zCdbjG2`HFu$viK;JwmyV+`?kj8`&VRS{xZRUNX3;F#NWChv0ss)BMR;i3bx6y!oxU zDj_}KXfDE%5I*p^xjsxGMzcCRvm*TO{?gnp&#qX@1!adCdh2CBZ@2Et1AkD77O#l6 z{Eh<4_SOKsy7y}6z5uj>9u9E*4ZZd^sQcUkjv7@PB}s$2v$BfN(XqKF@RiF$4en5r zXybu+7INGRFMwGoF;bOuSU@*W=-Rz@Ntk)UyriQ%30t4=eKV8NQkcn}r9?9-I zA5tC_$kv;{_NFm6-!Zt@N1Hp)*=2ntd19sy)DmldZ;o@jyQEAmX8Zi}5LbRehRbs) zZBx=(w%)HI3T`(DhXiQlGzqG@ zHW&nFG{z12I))FN4fZAmm5N?p9X?2^6@WMFEhLsAbf!C8 zH7vQd(u(w=*trx=$PK9{*+^Zvs=bY-cN@#|o$t-tlzl9mFL~tzEer2*QJhK9luvu3 zW4Bvwd{*BmPNu6{>grtayp`v;tEVil`BKux*(-Kt#VR3vZ1neV3Em|HKP#yO%i(^B zyfs88!?)^D$>D)6791Voi|J^GwPA4m$*h5s$2?yAJz8bubivHX9eS-BoU-}O=kx_H ze_U*P7(hAOFkH8uY*>5OCfK;2bb?X-`Gs%}D`Soim(~p{x0-+8u5uSqS-5^`uzZryW}Yf}&-6lHPLzOCX|Jn}w}Uhv+ISkt0@Dk-;N8Mdgb)#3r$%Va%}CX+z1Ys4k2ez1Clt@{$B27jfCiI|nI+MW)9`{J zeok99BP=Ufk}plNvIW(gIBKhR#M3zCvp9;ZDYBftz7m+BGHi~R@{Hr|xLGSBwtm55PP!}RV57G!v z%N$oX;u{^4^ZBsJN`O6duePbvSJ>rTGgX=!Nq{VMp7!OdLDYnP^WUs6IF#j>A7Bc%^FRwsnu}?*0udnQ*(BI6w6?O#5!TIa{oc7U>y+{H>y9gw| zKYaQ*r=O`0-a*6wK~K~7FKATbjw1v6+3A7#hwOBH9|Y=O=iwkQWe)Ekvh!&e+z|Sq zbNW46`?NuJkPCD0+lj-$eyKaexgj3x!sd1!<1gS27mJ7kA)cVZ4TSlR1N|<|;2D4z zAo~4LfPbM3IEHoTKyVrgMg?T2p0H_4`~@1Eu!5f^;)x+t*X>`>X)<9SI?a6r14{{r zK+qN|4CwOFKu~#d)U2SQ5eAmekou^P+|X}tde9@Z%R@%GQYGyCZlx<24Hx6orF z*l0cYhmVG^--QQ7cK!ncy-aW@D3TP8*!KT@Wrz|TinYH@gRKlipx;-9+tEOXD+3Yi z_mxrlpTYilWo-O4CeoFGcvt~@9OA%Bt$&u(A0P)`@vwDw=zhP_yX67hhGd(B*gAD45@$&DbmkgHhgpu z#R;_EyMIATL<68z{&0CpbTrT*6&Pz?kvKnt2On`LRS?@0`*2XI)c*|}j4FsZ p8p;$zT@M4F2Uz~+<3uQFKbf+Rj1I^pX#1T9B?8!@g#Td2{{Ums3BmvX diff --git a/test/src/test/resources/hudson/maven/big-artifact.pom b/test/src/test/resources/hudson/maven/big-artifact.pom deleted file mode 100644 index b7812b68e8..0000000000 --- a/test/src/test/resources/hudson/maven/big-artifact.pom +++ /dev/null @@ -1,67 +0,0 @@ - - - - - 4.0.0 - test - test - 0.1-SNAPSHOT - - - - - org.jvnet.maven-antrun-extended-plugin - maven-antrun-extended-plugin - 1.39 - - - package - - - This is my artifact - So is this - - - - - - run - - - - - - - - - - m.g.o-public - http://maven.glassfish.org/content/groups/public/ - - - - \ No newline at end of file diff --git a/test/src/test/resources/hudson/maven/custom-plexus-component.pom b/test/src/test/resources/hudson/maven/custom-plexus-component.pom deleted file mode 100644 index 941a182de9..0000000000 --- a/test/src/test/resources/hudson/maven/custom-plexus-component.pom +++ /dev/null @@ -1,34 +0,0 @@ - - - - - 4.0.0 - test - test - 0.1-SNAPSHOT - bogus - \ No newline at end of file diff --git a/test/src/test/resources/hudson/maven/envars-maven-project.zip b/test/src/test/resources/hudson/maven/envars-maven-project.zip deleted file mode 100644 index 802d3c0e4a4b2546c69ab679c2934bdee196c304..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3374 zcmWIWW@Zs#-~hszt2OKxkN_tG3xls~h@-BjpPT-_Qw$8u3<2Kk93T};P-Ou)HH!dM zz%~0i`gyv!28ZbRx_$ONbK1vSSMMUPx31Q?Gv_x48C)@b@U%$J%U8$K_hRWP7S0(j zC67o;YGtrYf2R2(O-=l%c(~Z~CC|jPE1s#o&iqvLv4|1ukXcQ?4c&p(fH1-#$9qtH z!3C7f&q>U!)GJ9XF46YX)eAgv-t)}bCrn^NEDk+$;RPz;Mlpo77u67Uplm^Yu3klM z&e707|Jw!vbWo>|_4n_V@7q0XzRgtD%mWcCuYP=@(5222vdVbnr^hGXo)!O9S2XFvsTb}ZvW^=z z9iP0k`0A96K_&~70y|4MCz@IA-Zf|AVvTQ(Ohvy^p0e$YTD$1#?FQ?f$IRc7%k12f zG*^UNjI?0Bu^=frSs zTaDZl>Dch}$Vsn^w4!UmoVH5rew0)DB=L~NPlcfNw40X-Y>Fyf>bIUu{L*($-*5f1 zc>R2fY`2wDG!$o6u6$ChdwG7!I|DXL(}=cg?FTvvHeYy`9%(FXxs-5w%a{8VmmgaR`^`>thHJt8n9>4t_F_UIlYHU z3XL-sTo9e%Z!KISbIAX{;-7UH`(mzL?|!KjAbD;j%kIDnyKkK{eDyGSZOxUy`-eWR z2((SwUCOv6@5(>p6>7iAste1CzyGYNE35pt>FQC2ZJJ$vHJ)*+>fdkKm|Lj4`}%qD ztvbJ!?9qB9W1b|ub@TOSEA-yH-E}theD$*cEk)*Rn^lSWJR%A@7y7n_)}EIrz?F*pL25I?Zk_6DU2x#1ebT_UfIw(yY{m~ z%-p}vZ#8vJ+to5X@8_-^hp%nC?^>|hC3X6(*#GLKum8+F<-5Kxr=06>=iS=lCk`Jg zspmU+Pal*G|EX-0ZUN>)Up7eU2c>fc2K3a=0u(DQN(Sm+X2Gt46RHA~JMbvuLspiR zSeA%Ktq_LVSeI1&#eUNDoD($#G_MzfX>8%0T$v@#^zWV(@FIUC%4ZX8wD6ZNh z5^zY{xS@h??pJ||j~ySL%t_fGr1!3WSL3r4P9B$47?^f^n0#RiW19cRsmCKtLpi1U zy98eFy8l(%=$5l=&D=*hl6B8|5`s40edIUwzUBpyr4723xxZE)(%O7XXQflgi|+V} zxeL2@`0oDZadCEz?4`~kzBuj;$8R#-UTV-N@^NzhB9pfr6#nz4Dd``FW!(4s zDf+v%U%YK`PfAWc%v;fJO9QoiJ5tL;uV(Kz{-eBZ3wl*r8ZRcq@*@nI`OAA4QOh^ryH2sz$s0)cOzf30gp?0 z{n4o_4O;jUUR|5J(D~>Cww6U|N0b(duKMwP*M-SXC$BBHO8ot#u%Y*0OX&6wTcpG? zJ6^3)3faMT&wbD1H@_#}vobyT>BG50Reqe}f*0Bs{Q4jKY|Xc>b?yn~b1y!->HByu z^Z8__orm3@EHCq|;edyz#|eszB1rkgK&&3-X~BKLOIjAK1O_iq7W+*K{8 zX#grl^hzp9K5LxS2)%ImviA8C;U{#$G){WxdTo9F6jJG?vCh6K2~;c&Hja@=gaNe$ z0&8A?S|F$Z-lPDvM*_T2wIVkNKbF2jtcOq_~8caSX^nG$WAp zf!Yelg)ykDfB@XUECFpffHZM2U@wJH{dt5LR%+wc0V=l<;2Bg0v=qm!4V1GGfEQ>l zsCocvgXS~bdO_tn0$5_`h2%Tj`a$J90%T&p(4ygD<0DmG(gB7O8nH3cE$fXasHv>1;5XglUU;*B&K)*9E2m#>? KV3KG6D+K^07vr%2 diff --git a/test/src/test/resources/hudson/maven/foobar_eclipse_with_fix.zip b/test/src/test/resources/hudson/maven/foobar_eclipse_with_fix.zip deleted file mode 100644 index 5d7f2f2cd5d2ad00f32789209bd4e65b9eb96b1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10089 zcmds6c{r5c-?k)6*6gxImN1s=vS!J?Bv~S4?2KhF$kJGnghYt4ls&#e){s(`?6fH1 zD2Bn%mI244vlIfMG6u(cFa>*dyCij(0#PJguR4qVIchMUFMM& zjR}_zQ@Z?&{_$>Nb^6LY9wU?Gv8Z`gb$N|D&uR}ZzlR1Me#8T}@I`9bhTk$f-BZNl z#c+fytRjIdqs+1|%4NK?#jTLvhb%GD@PcS)otBW}63k|W;YoYj#4TxiYonO6w!Uk< z_#lI*z1)b*m-T5quY(QjESne$i)$ZyafLZU5YA4Y3HEln#}%kLCtW!6BfM9G~pg1NfcVHPze73_kKP@fk6AMM`DcLdxnRY9(G9lk%D zAw{pFCc>-`9}#)(Tl31~tG1dW-^RNqh-=R2j83JvR9>s~7H8E>vKeNTI7J~c0!D5*LDm z%3RlFSH;Z2uXczW?J-XF2?{f~M_4YUVDiNTTZs2XK9@v6aI3#+@>A;WBtka$8J}w| zAIYcgkcPL9v#aIceKl$_FK4b64X+n8zR-+A1ToO0n7DPsm}92b#_B9J5?bi)=YEXp z2^IImov!p{$lC%txPFI~!v%j%k<-Vp#CnBm79eGzvy~ye6-@mfEQTUq`sGiuJRx3PbBsJir{KKp(Ist=-{UxJZ{8m znZqlr?X^E)@Z#nf{bNR_-dQlY9AF-1>JQX$LL_K@k(`4HxUR=C9+$uVgu+dmSe9c9 zNiDX5i=fMW9yU|DJo}J!?MjaCtE{ANgU%fy1}(km(BLYgA<;u8PF)rilA$e5anf#Z zap)JWIUL8``F!2$F@-+DoRILGbE3faz{ZzLO%pF|`f+|Lnm(H;)RmT&_$Q&-funU! zb!}M^CP%>6acpEI)Xjf-D#5!ux#ff5dfWYK+u=1BT8Hq>w~7`E##01`dcZfyNx6Hh zteW~-SvxSv4I2xKXYa|7i%ymv9Rdjxzd1~pR?zpoJV)Wln1uB7Zg+>`l^XK!i`}1)65E}ijCTjdA2J^d$ z&e3OIB$nb2t4aQdOtC(DiSoS(eMjC~M#oQ?xFS)CN-M>LDeX=)j_i@yZDSuN@B1U} ziuBBBNd*O)3dlGV#@#ZW2PA%U!!lXtyUnGciv+$y&{4ahmb=sPKC8m zcU4A##Eir{_R{89{@QHWxYAq$MQ44w2jtMY1d`%wGI4DTAR`=SFJ0PT^tZ&;#CE6y zl)UKp%F{BSwK&T50U05#oFglLTk}m^8;54`^G5ID>db5WnY!aVgW?NX0VB~SKUTeJ zan&J18NO6xuNXTIOcog%3|@dO>%1zyn|s>w5NDmD@QBr@t4#Ho9GTwB3=at{3)HMn z8#n9on^8W-Z+#SdZ+JN1oIjRsku#xselF}j0Uf4>8@E46fbcGj^(@zmMo)cZ4>ikAx zeLT5!`pu~yt&T%KDQ@|t#Ag5KW#Q{Nm z%DJuF#XW>pN&0ET*`ECrba9=F zF4ns&fyq@nvPPp*%(iIi$Z59%T;7-)xRy;a>sLn+W2#^9wx-@As@u6v!2S`y=fCE` z)f&2q2mWS|2Xeele{G>5S&7Uvsw#3f9s*zN>vf0eIo+~&m@kCXPQOpN)}78UcejE? zig}fZN$1TGPt(yLj!G#jQB6TRWFy{a<#nzqWO)aVCJ;}sQY#bkgEEFd*b0Kc}GGPKWvY(>#h z&{k7XK4SpUQaRh!Mue27!W*j5VVkjS3a3#?mcN=tLqDxr(-JbEv7lPxAKbH8B0DHK z#;yA`jiegc9b0tTqxQ5HO*MrPv0R@pCzp`I4MU~tx}Trlr0ea-P1h^Kj$uH^vAfic z&%UfXt4>UrX6e^GT3%|8^sa}M^x3+N5_|Jf!$0AgIG*J0Qd1r;UvE{A&`aPOn;aoA z9uK{etZZ-Cd}!@348?h-s^@z1m(vS>JGPudYlaxA`N0C##*k;AnW{! zM@o8IVti!W8p!@UncGPnR8pGXEEeM{d~__4(Q#>hpTSo z8IRS?{u43#4f@EUrt7DC1@Wtv!i55l?-AWm(P;#;m2YvnveL`zT*mQu9%|?oel={L z_~4@IHTZbO(HQc1FnLm%ZwkQ{?|GiEiPkubns@TEBY(vy(^R?y|1<(6A@h@QWXJm6 zOa0?|U=mI;omvF{bVSg%)km*`gj?MI=+KL1651JCGrYT9O3GRn7dzRXR$AX%Vi%9} zbuo;5_+2vN7W#NeT+o7AE*-IuW;rI zbj+wZdH(zG!3FKZ(rvQg(-s!&BueaK=iC^-o;*675a-uTR3KJNPwagoRVORdpYJW# zj{_XnpV^cQJ(yB`S>Rt6`8F4+ncmoXM!{WK$BAh?&PGw}WC((=DJ=cfF!k(D-vRx?+6WSTAQk~ZYNd4^Oag*h z0X~X<9oz<>%0^*n0QfP8gQb_HR+J3sQ$gZT@6@Lgz3SYw<2blQLT=dQA;&w#*xW2~ ze7)y;6l+du%zj%q(JPyKGsl^0#zfp2Poq&Zh#|5pGV1EtC(x@*}?X0sSmja{8hJ?2pn!8KxgEKp@5uW`sI2fzF?2QWwl6O}OKe z)Dea2G|sioc8G6gi$(8}qn;+}E*1X!vb?eJ1p9|eKKS3io4L&euH=f2O5K-G9CI~X zC7AVH@H!;cW5QQzVI8V>E2W8>>GCb7#PIp2@v9S36I)M&!$zh2 zW{Fy8t<;O(2^ry~tm_~2*-`jKb`GU~fRvVqff9M?{J^9?vu@u=#>)Zvlye6g`(lWT znbQRIErr^>-YW;jY0X1Q+Ee61BoY6{kvvTCmL{$Y>#smEM)r9$+7We!37X)BrF5x0 z{}K?UbGxjqRzI`fh`dY0g{D!Wg{oALRUIl5bCXz!juuaDp^A)TUF?aO-m$zo<9GAT zWrTxA3l0>IoXKR zKI-D)2k|PL-B0Wu+49FxZ_T%iia62V#vJUA?Rq!`Ab$`*OSUghPO;6CtKq?5cxI;J z&jee8#buQBl9ix_Eqt$S9^LKebqTD@`_`IB=rF4vrmb{H(ZTvVR>?K}BsJ^ox@f;M zaHgwlitfye>cONLcMx0>HZG}nvk#GPlT}Z|3fy99>3iR;64o;QNk@=lc8XPcIE4;B zARkGQ5kuGo;t zI*upuL)|*DAt?)SiDI=3<_%H5;?RIQ7cgQuB`tNgP<%rAmmO~f?Km}H#~Xgzaej(H zyj7Oe(G5HP;Ex@z#$d-WUhM)qIB}4OWa4nE2S5%S1%w*ot&9fPWWvp&>Om8(yc`f( z;oXU(QMrZ_j8r`QPR=t<;m)}Zx0YJj=Pw>i%PhNh5Z-U{x!2E|t&&FUl)o-*VnAMglF0m);-7|w4m9^2*uRDdC~CzVJ1 zraIkoVuZx+tEU}ZQmtY8$XD-dWm=|&Sa;}{

Bg-p$Q=lbCEE=}K);nYs$`*XYZAEK0)jUS+&q zcrsUF!vhFlPJ~OQz7^x9u3nQQi8q-wH8aHTN3XJ;y~L-S=O$(%e*V*Rb9ylSc>TMY z#T2v0Hyo~5_D~HSRef^mI|z;4gx6ld<4+a;#%1Rapift)PW>)IXH zo#Y>cO_Wy@D*Cq&$%SE^b);qWULq8Ysx;)}?mkCxVR!vx#z-}0BaHcG`t4|TUmIg* zMd0`RUzQb}yk5YeJ^z6Ze-H>A3&M0sfa3SuzDJ;#cf_eI>Pv+ai&2Z3Y z5Xe!sPj50=_5f$s3j?1S0bD_WkI3I}hVu0rgz>j-)Z(H4)@0iy!sl?Nq9AwE$T^e_ z=vxT)e^BxNxXeXH)OYjov(^Afcd-VBG&p6j@{wG_^A|#okOvMPxiZpKUDov}%Q(V- zzWTLf`f5}h4Wr-?wyp*?4i)as^%nTf3N^@srWL?%+pcR&lfidbr~yvq2fl8b3|{Mh zQf&7iSbw2lVSzXxg}dVXdBX*w?f#An1;`q7|MIh`HlhwH~#1VCeUAHC3@dGHRI6{&hHI|w)>kmzEe9J4U2zp<C|xpUfq>Vz8L z#!uky4f@9_ZjW_)9~cD-K6>B3f!*DKZeMVF!xgXMBV1QYaG{aybX<0+8-czw_?f$&{CrY80FRdgYH9=!NwOF z`_*4#|A$`f)CfZ@045zL>Aoli8Tl3b#sVr^+hUl=0{c&>0g}Z6+CuI~$Pi+-aF>rRy$DopTr^!^R();ezUx!9@H oK`%l86a>3!>h_uwrQ92ZkFEwDU@Nh(IDnsYVl1rUjl$x806GgyGynhq diff --git a/test/src/test/resources/hudson/maven/incorrect-inheritence-testcase.zip b/test/src/test/resources/hudson/maven/incorrect-inheritence-testcase.zip deleted file mode 100755 index 0a30bcca61d4003e96117ceb532d736c6669c095..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1004 zcmWIWW@Zs#U|`^2Fx{eLw^5IG9XBHb!!;mgXOLki$j{ZQ$ju22;bdSoeXrn~wm{jp zw1S&~k>v$50|S`oop{#ouz^6!dDmCgAv=%1cJQCrd4zY#v@kBGJ6ex*Iu$qS-u_ux z^JdG^rwvDP%m2K6(|4xl>U@nqS+Am=zMFikdNOlKjf3lshl?B+$ znxaqba>pn3lpB|OXR_tr_LXF_p6B({CY)*V)3ZuGPx7XjM-}LA{dIiT)%YViOAh~X z;Gg2N&Z}!fQ|Ycl-$d7PzdM?9;K6jUg|}Yavk7(Gpy(TKxi(0#)BQPX`H2UA6pe%8I7!ot=uv>eesg7@&kZj$ps8c28L&wmF&O_C;u;j(^& zjOz2l)dnl>1a5n<^`diqyy(4|CeEo_PqnDd-LUZ9K)|StoQ?{(CJ1WJVpE2V{st8tZTYCXSu|Mg zialoW>GI3%fB*6Zcr!A|G2=?)65uET1~J2uMi3JovaFCKkCxmahT)23h+zy20t{~* weSl`d;~Z!hD9*7OhAYOAUDk^*3^o3N27}@s!(di6kY|{I@H3Ep%mm^A06#8oRR910 diff --git a/test/src/test/resources/hudson/maven/maven-compilation-failure.zip b/test/src/test/resources/hudson/maven/maven-compilation-failure.zip deleted file mode 100644 index 771d0e861a0ca63fd43788078fc997146ac6533a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2160 zcmWIWW@h1H00Dzi9&0cIO0Y19G87jj>xYJLGBER)H+${y?C=V$U}1Q{{DL_Er#4Qg zwvyE15`^BTMCs*2)|-`BmPo1r!WahNcZLYiuN(|vJv`PqyK9`q7#SFPm>3x3v76#p zP!Iz2lpe@o;6Pat-|Pj#ut2Guc+l^#0Z-feN-p``UR%n`ByY`S*5;qEHIMW4q!XSJ zLbrB5-l6N0e5T#))c@b##jn5qwt&5*Lvh_yBlq_jhpIQJh1tGTo+l%_%I%8vqcHY8 z**8>$Z!UbbDJ0;Kwsnfymp+Ap#~mM@)J{G6j5pnPw&9c2Q9rlH`*Ocs;e6uQ98Rts zAB-2hWzvy&<-IO7V4cvm7OSEsLbubdFVUUWd%Z{dlW}tMS^4Yt->iH(r!j2`Q`y8G z**f8{N3$Y|TAxhp;;z-b6d8Ltk0V)0d$IGqSp@~r4Yqp98+Nk_FY2o~k+)>)j%718 z>&|=de7(qN|)*XzjE&Pm#$ ztA3R`9oST|%lh`F@Lwz0m<Ak7J&)NJuOc@Goa(m& zy|NU^JH3+(^MT%JEw5{xYP&61LhFg!t7~2X6IQIsJ5kh^Fzd#&w<=%mo0m1HF$+b% z+k3wJyI%3yj1dM-1@S=hi5GhvOGVvA*C(gf6~iEdoDFque{3q_=2qxSLW^;mu-)xhpSZD zH(lM;@QQoQ>)p>cGAaw}IxM}~Td7~ff6lmQZPVek)7ka@oR#4``2P6+4?(Mp>3v6urM9MCevjR%r+jeoF?N3;mDD%C(Cnm0uKJe7(?{FhCrTT| zriUEwP5;ZhVfj`hNizVb3ypLfJBG5p^3L-t=DxQ!7O_dqRYhY)AO+yq` pK+j?`6|+P@HkE^g0Z~2xO#qb-5O=Y%0b_}Q3kaWs{J{$10RYR!f^Pr- diff --git a/test/src/test/resources/hudson/maven/maven-dep-test-A-changed.zip b/test/src/test/resources/hudson/maven/maven-dep-test-A-changed.zip deleted file mode 100644 index 853579d789d9b31e1a9b2cd35734668b37514a94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2597 zcmWIWW@h1H00F~N9&0cIO0Y19G87jj>xYJLGBER+H+$XL-s%-v!NTx@`2}+TPHmh} zZ6&G2B?!IGiPFo5tT!vMERm1_Y)O15ZWhKc0O5?^KqqkSK=pzM(61Z}AMN<8XQV|; z5@2Lts9|DYP{3}AV?jX(&{K|jAeVtd;$e`JviLrYoa5$O3#~Bb&sdpx0ZW?ESfR`Qt!0|v!6cBGtk}A%%`|_ z85^(0gai6+w^?WSTrICVmm54~gW44x=Dq#SjJ~)S33_aJS@1W1ckNN7<-G=)PG3BZ>etR(x_Q^}SivHd*?XO%g4iZ*Vz8d0vtjmP&NY$i zTui2keHWR2Pt3pIZ_6VqS5v(o@ms<-mrsn5+0J|3zuU6QKYbUEX6|fzmZXLw(Or*D z7u~ya?iD-XRFa#RnTLpE;!+qam4Nl4rjol@liAS(?5PA{03wwv0!HV3G*cj{1Y}BJ zOhj@gFwLw2Vi{;EK{ExIN{~_r$hg@^DMYt-BVV(Dfb;j?T+>$?9AGyv+-mL2enn9w zP{eeChGo>kuKN60*EW@G`m=`H$*$#M!rUF|uV%Gfc(7{j=Zc>%u4q1g(|5?sT3d0h z2d6U!^9$b-zr;IPpMU-mmMB9Q8G6$yq$-val4)j++ey(0cZVot+R{#?^2*a{| z@1%oyhZTT{ytYf@J40;s46U{+x7D_0FZH>cC#n?ZHO+xV<>kFPhg-UqA-8z{|I7Km zZNb`$q8!s>W<}jx{^d=~?t?oX+G-q$);rg*Mf2mw4ac)x1U%h~iZ_0mF4xA$yZVH! zz@{VezhmEVOV9I6l?`XQl%z64htcZZFcRTIDVlZFBaCUKpM5Sn&Aw z7i{O>`aF7ZLq6wEN6trZi3tgCP@&~>Vv8R?!Q#ddRNf$p8&C=M0V!=_6gP~8_Y*g; zbF94$EN;9Y#mx?s;)ZXRyF$;FkW(^yxmn~-O0C+ppueK%VZd9LT7|rlBki2GQ#y=8 zVyAI=RXpbT*m91wBgR5u&EEA9Yo_}DK4@}*$LiRhUFT#S7}@ItZDd%NxV@}n|Gmm9Bjc($#c;|2rsTc@P>N1vaSh1myqGct)YLYLaMgV3I+yz+Bq4JwVOk=LrV=J&EP{ZqZru?Xd#BfAk0b**)dx%3_>^ylwc5E zgQPyp$_`>0FflSLY5axVG_ zf2d&=`pBVn3&S8psDa9Cgx4UUhFSO{hnfO2lGnh_0-J_Z6##vU%~;H`7unb!Kx5%0 xG0+4^DGW=gxC#?w6EayL4g)&})nOrsq6KI)BBijh0h0g&HxRl2tv?Os0RUWvH!}bL diff --git a/test/src/test/resources/hudson/maven/maven-dep-test-A.zip b/test/src/test/resources/hudson/maven/maven-dep-test-A.zip deleted file mode 100755 index 719c6618efab37cdd92478bf3b8afdbe7d5d134c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2593 zcmWIWW@Zs#U|`^2*k;FPeJj;(k~t#-!(=7~26hHfhJyTDy^7qN&=5`r=8CFTFOKc4 zUZE8%3@?~pF!xS6n0Hu#r|o@hm&SL7*yrpL^Ry1D$zo0#1PcRaM!I1;UQu3?Mj$B!G1XS)b^x)&91 z{4`yzjgfct30r|pN92FUzT=jj=b0)S&UDFj(vPm*-cNqq@0Nu9mzaJ>dC`QguZ1lI zOE$Wm`onSS1=Fi?gKOpK8ySxp>pCpG82dZO;67XEUZ(bQv58xqc&Bq&Zs>a?EnJZ| z=g*TvKQ}a(aXV~VTA{>#D*E@Mr6H=TcP#v&&vWvhRb8jYwEcPgKR-Y0eN>m^^^q;@ z?P39=xhrqZ)eexE#Q16I0 z>=V5(I^nV4@$WC#&cF3}^x}qm&YzB)kIVtU0OtY*I0J)WDUUUn0VP;~0bX2`tPc)t zUh`(Jx7!e*jawThR9kLhW*$QCMWmR*t(Om3Z&qSiBEkSJtOnc!CK6;f3u72il3H8> zF=ZDp!JwN0NotRQrrh50`d};2s1-mggWVLzf&xc9kgLEUauUrr-QJCS%?1L_-+yyW zUukfF-C$#B`ilU=C5l~(*o0KwSFd_>znXWePUQ0HX^SuMr}ExNdDppXnWD)KiTBKL zia&pw|Cuh;c?Zu%Oo=`(VY&0_J+&1n#;=&(6#O_CnTu8Kh1V+n@w1`Opz!IPaSOO?OqXo?rV6=n)BN-`bo&uu=gh55a`fx+d z+KC7A4jBN8hDt7Z@1XM6Po&nI`sKWcocZ|AN0QkE~ox^?t-}3Ex~kF-B%P?|J`j z%P#-)T|An(v+Y@u8jeJFJvv=<@6Neb?4VQv3F7O(h*CYzWWf&%;%dA>><9{DMCxCL z7Hb$m%vg9oaRWQY+S|B-m~WSR0?(e1Q!;y%+xjzj!)0G8&y$f|6&ohsAuanM@sOF+ zG@j7uOPhr5sVG-FJ?Cf=;p51L1aX}KuL&rK*9Eh)3jH{mahqZC@?Yo9@67HJGHaQY zI`4a-T1L>d6~3C<>sxhC>mTAUlU+A^?aI%!jI#o`ZWu}4z8|Gibcb2R?KRc~hdi$P?^FhMptl@*uK$VCg#Xi(7taWyL&D0grJp$pKL$H6=RMe;CB diff --git a/test/src/test/resources/hudson/maven/maven-dep-test-B.zip b/test/src/test/resources/hudson/maven/maven-dep-test-B.zip deleted file mode 100755 index 21fb317024853d4761e7c458600dcc5128a18e05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2606 zcmWIWW@Zs#U|`^2aJJ{OHuQO@=*-B#V9m_Hz|J7bP>`RiSCN|&8p6rITvy%d1;U{f zEDSH0UocOd?3;hcfT!*KpRQHk)e;M41c-IcHREIxy1YfYD`@?a#hzD}=>Goh9kfmK z$o0IBuaAFw?Xoa+X|aIWEz#&yxktTQpRzn|GG8E|zw-verO>wN-Ij97O&)h9PM$k) zf647_D`Z*U^-WN$n}0rR-G&F9A;*eT735qduAVVN;rx~dVOgbzcf61hY*`|?{^YC$ zb3K!vxm|EtzM;1H)Q)#LCJTNzd=3bExvR!+W_I%@w?^05R;E!4o4i|fB)mWJKdy|6 z{CTjoG?6RyQR9<|kLJD6On*B$Jt$S@x#-dQh5ly0KRUZix_Y`~XI0dmpgUiDG~*69 z{#N+m6PtT;X7qv^>b6g`9G5O=VR_uT@5@!r|MzXK%(+!pwWn5Lz1~ZSJLRQU)8n)& zZ(f?W<3U=>yNe%Aw0TP}^iH^Y>h8~$gUuFq)>PkkcX-1=^8jGra{&XNfx)np#~RFl z5-h;LFD^>f2Zubbd9&Ak+YWfhnTODOkSM);$a=F9%MuA0P!uSD;$~qC z14>ehOCY8k2Rh*qnlm8DE(n-WOMg8Pg&m|L#BHCoUqlkPLC;=3hhYiH??2_8Rl|Ie3Q zK6~#wK?&RQQ;poyJ0B|Zw5{&@BIrNu+f}ob{70sK`(cnM%;Vj*>U5AJXa1y#HVZei z#BuR+=${K!x^}Ad?m?3aGF!fXG&PH8V&eRhBooEIc;zp@^DA?Egu+^8r7rkxBVuBx zot=E@P-dg|r_~OJ1o&_JUc2&gpFpn;YtD=_7w$)$35sg#eAw))Rrm6<%G|5A@0uns z^PaqYTvb&-^Yezo7nyErN}Zqew994ZmL1D?e3ARWa@}8JU2sU{!T*ca`sOp=oUonu zy#Hp+F8}OXESkB~>p6}vbZ!?pGX3eEopZ19gJK$z@}-jato7!*6A{EtpfE8O3H$<4+fQqFPO(V7bY%DWLQS7Fhud9F<^TTwrsD3K(tZbt%#~9t zE5teMCYgqmI?8`|acJMIt}6GK*B#};W+w&GSM1Ueo$}$BqOY=)SN`P%ZeY?)gh*?wqe1W>qZsUZ{~#bZv#NruKSCzbE2t zEVKEqpS^aaXnv>KG$u2Vp113D#U_~@deU(+S)=Zy_e8%}V&$R}f;K#o{XB`K<+Re9 zf=vg?`qU<=?Mtx?in@^eHC}KL3ryAwOBz8;cpb+IspCQ`7#JWX;3}FS zCNMAvFuZlF1sVh?sDau+xtfr6P6lM{TcFyZ1vZgp@S<0oe>_34y~P%px1vF^0f= z4)P1wF<^tBB?ZtlPyvqc8m^)nIc&?Zn}$@71C0e0|j!AV(scMog%q zhFCkY8TdmCvou8xu@e{uA)Ey&TM=G^gcxS2iX38mEJ$8Mgg;st3k)?#`3g&>xJnab hqYGJa8I4@F0F4HfEf80;vVn33HxRl2eR&1U0|4Y9Hjn@S diff --git a/test/src/test/resources/hudson/maven/maven-dep-test-C.zip b/test/src/test/resources/hudson/maven/maven-dep-test-C.zip deleted file mode 100755 index c789f277b15393bb48be64c62f3b98155a600858..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2610 zcmWIWW@Zs#U|`^2V0YlNepxL3$CHtP;W0A<13QB#LqUG7UPW$BXb2|*^WW-LufQFx zUZE8%3@?~pFz=ll=zqvS;Q0NYBB$?N7khYc!Y!8Ci!3cH$u-8l<$ZqF^s=`<+`j#7 z06XIq_S)Bf-Np~6 zc~k1A=l0z0TY(SsI3yn}|C#fYi+i3&s!ll5BS(>)U7ehte7N(LhS^Jq&sA!gVDdQq zlh1`~OAL#ZGZqHluyIO_DHoFp*t5J+V|7XFy`^WiI#w<|u&8vd)Y^c9OP$1emi}n| zXtRDz&BH^x3|fsoIutn<`hT0U`P(Vul}6J(cRgBvL4Ee!ABsvRU)Al3xvM9qkyo`$ zL_cADtw7DPb!Kml=mxx*ELSvjK~R8G(?_THs@E;|^X0Poa_w#J*iE>v_fq0c`Pb)m z>;IojkJGNacd5_faaxPs#SaJCyrmaaz$jo~ zFf8S<1~Z@p3or_bi<0%h;m>Q{>}8D<{fMBc! zNCT4%vYUl53@Ax0E`gY$TGQ%6tPfN~QE56;$zPWb8JMO&)+2RRD3nDy-k5X8)fc2tA z3-&Z&orFDF5C$NekqC^~G_=TtM2jvkTJEw{H}C_?gc>FW1_fxepqT=UmJnbhBSnoX zFls;;R9LJJH`J`1crXtbHEr)Jx#Yc2={)P#i34}aa974?q$;*p>Ovzj&@UVGH(lG_X!!%Ci``n8&u zBJVz4#}vdBwkJ7mQbR#xi>#m6jk6bBE*%M1lk)Da?()v>R^L(QR5*8$l=vV0TeBr& zxb%8&w>@8eROaY%vK+{0QH^OVU3U1`Et;KE{QZWuR z7F3KQjKv<{s38^zY@UD|iEtV*p^h42y~t+Z4>8QL6gkAsVHkvP7ATVW7AKGBC4cc6uGs;Pox7;AUWCdBM!U z044(9CS(YR;4r}nV#1M0Jzgj9nUIdt1ZRi|hkz!W24XC35COWIgW=icNw!-!&g|`E zWMGH|I*}ddi-P=Iy^7o%uqPCN*2iEvp*QHX-(drRJ)cFx&L8n>WM0*?^q#|_hLDyW zirSG;(~oR><9q9$ZQT-8N2f<3@6Wt>mtl6tYI8H!$%VOF_Rr20eA~1!?AwBsTQ=Qd zGR-?2H!u86+q5lnQlCD0a5Zx8{r4~bS-o6$s_5Lk@c!2qZk%$;><eq?8CJy7xpxMPTb|eY%x0_a7*E`&HP(Al3%R5 z-cWM;>b;CxUQ0Eb+_}~sO%}AWv|gFKykv!4YU@H9Z7!2(n+1hi4?drMM`N$xwJmf0 zPMP?IUB5U=?Dg`er+@wXIdya0lYrA=b@?6IgvB;%dF*04QE<|`DVp8E z=#_rwMTaTsL6c1;Hn^4B9Nv9SdEycFZU;+g{{GWe*E{U}4n(SKR_5Nt7OVL|P{R2* zPfybQ(x`_j*IoLBWJE6eOnxD9$#n11&z@crOPKt4M zUgz>p=d!)XYfeiy|MwT<*UjZu)Z51hN==ZM1f|Dt`9lZnfH66ZiGhJ1DLo>`C@5JT z#uB5G4D$~e2(*^hxlWP2Ez-udbJ~q4PA;L)tGtotOf7ofo+uOg^*-BrsS0z@_B+-0 z=iZ;|B%Q4#V7Gfk)b8bf-qdbB7V(kKiy{&$GfE$|5xbkc2`Nfx7P28%Y~z&mfZdU zsaz}WAKYaycPXQY{}zs^*S4JXK6pqXq*ThrYJ01(l%}5Prw2Acxo=Z5mi*v4?v}Ur z&yz##Misfd(p~ORE=~vZWO?+_F`R z?%bMn*OKMv#hw60-WN<;COlYVFl`@u;+C4LSufRJt5$D0r*9Z*;CTIr_m>W_$*hy! zwq!OOwGOhW;m`bFa&CoR=i#kw^%Kw5F$8!sGRZOHDi|c7MT7vuTSpKRQB1HxiV2MD zi7*YbkU%!g32qvw$N-uKDl+hxhFM@Bo7Mt14ODypO#>AlSWUxKctA`8ra*=zjmLl_ uJmCQi0~IBB48u&n$c9Y-rf68OAsY%x%@~HVvH`7TUDa}cB(hm*cWMJlf+U3Ou#Gw@|3@?~pFbBZ3 z?ncwfgQT^%C>f$%2&h#KtM*COf+#i%qG``f%*=zBA)MLiB}|kVV%W^cN-Rr67$l0- zpc80*k;Z9INosKk#58rFNv3F~i2#F5`h)x&>Tc?{hMqzI5`_W<8Fd z0&dNvkLIn&mU3!dU3TvA)5XEhM%`9l*!eJn0vO+eHoe|ZKV8?+CgeEeesi4$=a3-$g1u+$99K({v bQ2eGMB{me}S=oTP8Q6gE4$uHoCJ+w*_on}1 diff --git a/test/src/test/resources/hudson/maven/maven-multimod-incr.zip b/test/src/test/resources/hudson/maven/maven-multimod-incr.zip deleted file mode 100644 index 71e0e08e3aac1132cc5c24b766efbabd7198f28a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10295 zcmb7~2{=^!7stmEV_&kyV6wdSEhSCLmMkfIw#r&0lD#YmDP##z_A*K-vSf?*4OvqP z$yO3VC6Urg<$tfK_ujcP6aS}2>3O=J`Tfp0-*cSr&DfBJmJ5YKp;2@3>v43o{nnXO zC={Lsg`!7sqr8rL$On2HvoL2s(V%lK7zkg!U|n+J_sWBkLDYBQkO7avF`l!>h{8U=~wkN}BY}J=yBwC|~u2_GxPaWFkgW_+!**&>a zVSxQZRLNfEFmo%cZEo{)fA?tWf$kW~*lRgc9ZhFZrce+&jFpa^ZeoU-Ts{ zVOj$#J9bXomK}`?x-q%Tq4t6&4KJQ~?)Ae?egFJe#xBh6Pft{GPltV;{jzQ6gMMbi zYjvCI>fGObV^(KIpQ#8LW$D^0iKhzAJy0AG6K8(aH!}-oTIr=(hvs)YX?Z8SB-7|T zKGyPdbX`M;hfz!au=2%5*CR%S&p(d5bqiSfmR089$hnJtnYq>Y&4y21QW+a>SLWeg zXfz*?*LTIBqzVpks-W>yOnoRi$3%^eip5n2+UZ=wIu6*~C_PQzu zA6)V_oY3;Vm}AEzEe^zId`~w0Aw2geXzay8>v6NW-~_ri2~vZ%6+&r@fvhqDSw*3g zW7p$WzWMbV8px{0ac93{E}9A}X+;4k{gDl&6?#<3kD2IEX4s=X-cE$aSyUs|_&5jR zabFi7-~X4vLymFO!QWvukSrn$0u({eu|B7fMus32kd`9-@+=1+m0)TVO7hP%O)oD^ zbKth};7M14jzouCtoLkCWR99S$tY}?e{bOg)rnz;yY%QggDxpz-kC~nZ(dH|Q?R`k zwMEC5rmjo%g5MXBAY}_k799@p<8E(8qo>_2jFT zE4lhbCK<9a#b@OnDKwzBgxIOtnoTTGt6b%}>!Mt->`~HM!6A{wu5NlFPod1$a-m8_ zE8f}1Uk}$VV#;HmU`AWvqjF~Rqf24UU2n4AbPc{?C|b^~+G`TG^n-W$`Mi8m>}bWv zzivvqXQ%dLV9f@1(sG79#Kj~HPGN_Ry}2EVqFjZ@GV*Y6^IR?a$Vx_*(F$WNWz@fe zl}HlEGJ-%*8P%LROQH}$8I1z8!SeU@X8~;%0AFH=GD6V6GJ;B|4S|)5D`AaLWY=C; zVobZK_<&xq#P7(Yu@W8|bB&Hue0SlkH^V_J_hhYa1f}M6vAMAHIe(0^r)z=HfH~iDUp0VT0WbK2?zICoW0p zc!MJQ*?`bpDOo;}%-r5`CHFYF#BSXZD9v>DO7FWkEjB;=!rwrj4)0kVFpT>LcXo?z znxvigO&OP*t}>s;>51t91!1aonH=R(tq%W)%Cw3Y(tC%L%q4tW5?XW_6DmEXxx;@j zPqjB#{*s>^!=5AhZ!qox<9B$5^zZzfwewCm-%x9tRcc1Zn{lIKr>1+B)0g<>#VJ|V zT<2@+3KVNR4tl?B(dd`*_44#79Svy?&oh`T_VMS`GXrIWcDp{_w1?Wadi*?_tZB5M6)X@F+6iCaI2 zP6fVx2c4w#JG=`yN5#f&Q~4on*9_PE^?MWl9$l>Kib>4vTci;AHcIR ziUF$V;l8-we$z+;|3Z|ZYTDgnDUsVeX&!r z$jp2+ba_|Mrij?FH&q^ip*9^R!P~lBT6?~-o#7Lijk@-&G*h**Y>|p`4I+yOYW$RQ zkE~;45kVbxWh_$$jjU2c5C|%w>lBL!q_NH&^^GEF{DdMx(7+;s8b655g%uFk_<@cI zHvaBtf7hM4>m40t9vCY{s>E#Ul4w7miT*OoAeAcq-nY}+eDUh-GkmGp1@0TPB4THE zyyi~IVg2{XN6Dgq8I|(=9b20M=|a%f%k;5Hf}O7=I@;xSGbar>wg{M)UZ{BxG=5{` zvE$nOM_o&yF@Ia)m6&#LT?vnQBbD{rYR^nZ5N&UnQ`0g;N7~6}R_4L-lW!ai=KJ1-(~a z$jtEZG_^^Q-sKq{lC2-2I>c|*fo`*o?SZr^)h@o+ld-k9x=3Y|bCTxA~mc;#6I4sdxb4f{g4L7ab z9^yuuQ&WvyzG>*w`*6LVixAh6FloQNXkK$T#7jBKtNdhkv1&pgufe{Qd|>AjgWdBRVVMNjx-EOT=XT>c zo%Z8P%OAGB{NR`HVDjY66t%5}%)$;Tc7Axa!1D6q3jI3KqI)g(88Ymxl+6#MG8zOX zUl?P^68~hnRb;!`{%9*1UjGQUT>kQf*)MAT#v*49U2uBuFlRnIrREoB(vWUk*6}&} zNVvpd7Y_q#HMwK@p&Yt=qYn4`)3?1mlFN`E#*)mxRQ7{I^=$<93f)m)UVhrtwsAO}r8n8kwVSa*2_iSvXX_zk5()%a}*w zXrp8No9^^2n#~ob(GOA4m0SylO4K#c8PKVgL0|oe!#0&V zXMMDeH`tl7nZ2=Vy`Pb`tC!L%`dY2IZtQSBrs>Patf;Rs{5SYIbJ?)(m+eiGM)`*# zt*gh+YbM!#2#hdDHQ@~`{;pDM-7yqpF>qOJw%TO6@rAP8)sIYd&vXw#GXd;69jBdM zTL3e`h-fBg5zPd!`P_lcge)^nU@vB`{Tw41(0kRZAW4R`?CfXN53 z`GtEJNe1qMcXBvfS$4mLtMyIhY6jL_@?W&8RIg{QH@!F|Iv&iUllOex8xs z;fb}^#_(Q8E%|5bt4i|4d(?KA0z;&!=DYLFM7K<(!X0Tv{eoG0L^d2h#FH`Iy?80< z`oz9c>dvx|@z*u&qcVfJ4>x0^>N#D)lbCu~C$$e@o(^hQ8amL;2H)qMXyv1u$0v_U z4K+HmKd9WiU%c7#N{a7rmVme0MCw1M4@@d+Rkk%fX5XJMJ9wh_E3RT;I`nGbJPV{I zh6GCHkPcxOCsriE~YlL&JdZI3yU5A+jb0q+=KZ z8U`Q;OBN)62m>?>kRa$-mH-L4I}wHfNJ}kLFJvd#5XjO19qSMe0}!nZJ1FUf;5dPy z3krK$b3oT^V+((>#H*0KS`Lnw9b%@TgUd%+rVbYe(du>@=6BRvJAOmwjocCqd61VM za?j`;=ENQKS4MrbjY(JEm6{tjWH^iMo0L71)<8AVR&DUmruweH9-7CwbqU3tB@xsN z-yH>Q*^+N8?(Mwkeu1-hWkuM&UPVd9-K@Rc&B1UkRY^lI}({+6A1K8=TOxX2iUiV!rgilAu#VpUd%mQrLdI&~0P5`*~HbKyyfGlxviK9_#!=Sk}OMdqjq!Or@Zbo_8$fxN)2E zJL;KBIZ>*yR|fAI2yFUmhw816Z#GdfJt0?B2PT=IaRBxmJN9st79bH~b4Z719DwbI z8FmlA9CB|2%%O$vjHBv*-DooomzMN(#kx^T<=e8)J-_H~sGBrBKfFIFxmSq#W$?`3 z0jB~k6WpO985iNMWSBd|4!A?1mEynLp^CXQf;;pPbcZT3B9QJ-+;4X%7IcR&WlnTQ zR&$4ruI3K?WuR-L5!|kDP|xCSQqaO7{`8mPZPcazj(j)I{#Rjm~&cE7hfKNZeVBXO`nT~>nWVFh=M zCQrP6+b4BAwtH*dHi@q!5xj-PGQ0%B_&0YWmy=njupx1{)Agx(u6db_;I4r*r1m6k3fUg`@!*CE` zj1ib$0$d}DhlrIzj`eHGPymv?e1PBaB}E`~Oz?dHbY(*NNMAz0(PgsHoS%BCe7IaxADy$N@>+UwD}M zC<38lf`%;=IfC{`U0`?`B^Zb!N2)!zCk!Nq_#?&eh(CgSa)_gv&rbXi z(A*;z1Z1L#qdG;7_2;OPx=!$@DszxI9721bS%i!#srv+vYS^EtfcAcSQ9wk=;Ykf3 zINpvEIy78+x997aCA0AZ=UNVP6Xb)V?kx?bx_2E&C u|1%ZP-tWyHh$uNc>9!5WyYoSZhHDQJ&N|?yQWQ!K_@xZA>=}OWZ~p^ZgK*UV diff --git a/test/src/test/resources/hudson/maven/maven-multimod-rel-base.zip b/test/src/test/resources/hudson/maven/maven-multimod-rel-base.zip deleted file mode 100644 index 912f30cc8c2fb1d07486697fa7f6934942314b92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8620 zcmbW52|SeR7stmwwwWQy8WXux7$sRNTSBtL)euo8OIgO=MU*9bB}=)NRJ7h!Bx{x| zl`SgSv)yiX3Z*Xp_ciH#XEXJ$kJ2Zf?{l8>JLmb$IcCNztXv52SDXf)#?m+6|3D(d z5bmB%e#Z#fidL4K2o`qN7^B;pQug=-awC{nXPFQPRsrB=%>V-UH*$$!Em2v%9r&+Q zW&{EaBY1hbD+Ib9`vG#M1|=jZc~;^ukpU<4lf^p)qPPlE-`a3;@msy-#W!wMO&F{5 z=bxWAs*xkjVo}f))SJ917>^i4V&WY-$p}nYxYl}l>2$tIPa`U{d~W-PjFrI zAWLDH>KB8#kTdgy{C7F6RlH6w7{=&dNiW#ljknC2l<-sCkHS5yjF`iW?&7esCmkyF?@{Z7-ueT?9e z{h6zFmq+Qh!OGK{1KoK=V-0NdbjlU&jqD!A+Qxbkl#6>Y+D_9q)i2}Cn0WtX&O7_=3NE#b!!a-TwcCf^M%D-AH7Y9E;k4VH8h?sj zeV#38EW$OcTEjv!80|W#+<0SeOjUkV=(&ayOEQpzRPy5?6OsoegOB%Nl9;^P!s&@g zo5Dvyad&j}_&-srX`$R4{T+Xj*S;M^c0p0PJYRy3F9}-oMWY?6cz_DWVRYxda;4qGm2==8_&NV;rj(71y~57F z-r)AF{@x(o{7v}lL8(_;&;;JMPUA5}*RaZug(g_+v0uJO7d*cDxVyBq*?uS(fazDjVotXX61 z6C2o{KPM@atzWJVN=cVczaXg}#p6RMDa3<<>~>-B9<@25G}bpUtD=GTCr~Br^NEPSgBOh85dq_@efj&V&b>#ewT6{PbXc}f6OcOM5E|L1C#PQ>}^^Nme~M`QU_BGL(& zb3_>zi#In+$$T(Js=`MzH*tFD6GBJ=N3UmiQoxcemcg=d)qSjZ;TTE4L(PNslLg z4DZ`9{K(y0gSV(y`r^B}*WM!{Y~ntyn^JiC%>@b*3ppn(l-vrFLIV|wt|7}GUmQ!a zJB5;o+c(F`w;_C*H;>rbiVJ(k^pAew?|w6X<#_OH5aC=sHc~Ge!#c!|$E}Vj%In(7 zAI$%C*Dd+QtoouBq95lO);XLak$s12BO!CO<*Hx>t#&b!J!YGG$~LKVUZ2@mVbYYI z&D@x)JJe^B_8~#Jd63_Nhh&*j`?P5j!%_q@(2Afip`~}2GuwROoo{0ORaPs zX4VdzmG2zELD00wMT4VfOc4V#EGb%2$A?oZdbG;6|!i~tw3mVw!hfW#e z_(Y=}$y+g1Evx)YbX~lZdN@jSrdzSS?c&ul;~7!2vBKAdnzGQ?kwpjdqygcs2z=pC zw04s1XkfTes`;A0d*75x@bz6$Rvj1ArV7o+s@gUmxIE5X`f}Gn`h`I$DU>aS5>QqL zrKHe zf)}zTgQ|yHo)$M5%I^8Q>a^Z-&##N4s@YCAsfET!XLA75o%M_B8xig(a37{KQq;FC>TT_EtjM`~@~ zG)FZdcEiNn!945M&YdcQ?o|U-hZ6f+(^a%<9)%*GB4P>zo~8|z6lJ_ZLj~qc*Hv^$ zu2RX!RX{>All&VSz*Q#6Tt%16RX`98Wvb7c8&}~lwY_t4M!jiH9_Y=79OkdwFRaiD z7QL)h{7Oa6q@&T(Gs)wwxUVd-Y-VBZ$%_dEIeDWL9j8;enT8>2#uMcJ5qe+39urt` zRZG%JCNS5&Pk3E)#2ud#&HbI-%DisZdIEIoSfAWUwY9zQ@xj>+FJWy}E@oS$HhcS9 z(V~|J(TUtqV)jC9x#I17zRkqCQ9fmBC8v94Zk-ul*aha4osEpF1WlE4-OX%_aV`g| zZ48rru;-ZE&Fl%g-s;4f9~@REzERew_thKS~-s=wj#kXJ_!>AX+DO%3PfT`=;Yc3j@gBK z4jK6g{p~$z&<(@Q?x2%FS?Mu9HQTwBzvKxKyML=0@=$iqoB74hJx&cA+L|( zf{?vX@}Rfq8vXl{>;;6Prrms_sD>7rP~a`nh3o~S)2McEXd$p1QrD08HhEjlU;g`~P-^Clqar%taZ}sh2_{`aeQ6w*y&Ev0oM&CHS{=w9 zg2XR!#3hL}y_2bbE^ok-)ODy<)be3`QF+kN^}dEf|ET=kQd1w(l;9>&mfFYVcktf? zm3d~U{TXQrrHi2klqgC~p{IMvUl{V*8E6Xepdiy3X$nGFCtoyE`wK}^3MiN1-( zPDw^`M64lAE#nS0E@<_LPaWAPF6qg*m;OvLrZX9reA)!oD=$wi`+iI<_m-xXOUqNs z{w=~9T@0p{s%Ol_D@-k0!pWu*cD_`W)b0_Kbr z_g)~tx_GB|GGH%pfW4p~0DNWvIp7z?{w%@5#B>0MDgC(d?@U{b95J(@eAXbQn{3&4 zfA2aw#FJ2*=-$59WhcqqV&@z1n&5avR30 z^>vR+m-kH~Lc*)_rsRO+dS{}@ph8`Mg3hs~Q~J2nB))UL#1}h)6=yQ>trpYWG7lwG z@cnKNf{KFLwKNy6WJ`=)Kh7O0>?BLv8rYX@^5Mal8eIK|33C)>4(Rxcp_LYg(-b94>KP> zz4ryqP^I-MhND{f%_jBtd6fl$YBBPy_Cnm7GR`Jhq`BAmW|&{vwzh0<>@gu(@u~~S z!-=SBwuJ?WZ%s;}cdz2Vi4S>?4zDsZW@28;Lh=;qy{ORlQo$g`w83woEh!smOG=?I ziAHZnN}>U!gUCLq1Ec*Yot2=p7dt!%c!y%L3k2w(Pe*snt=nr9U;w}(AyBgrCVJ20N|Nk-WLKVf%`(5 zC;d$J`++A0o_**7zbGns_T^b=V1GLM)C)X#_Cx5hq2R%F9?hJPvQNFtgJ-{GiER#3A z1QH7IN7I7?GtDq*6Um#NKtY6>{ui<2Wp|$z7AiXiZ0e;ATqgu4c@maFUSdOK2QFD? z=7c02^#TVjoz=<*0A;tl&H;*q?nytBeO2IxNKFshGAz{|gA7rY33>LzX<>gl`_%gt zc=lWAvZ3sQyO0&KPrYk_XJ3|^Mou7k!R(VaJ>Ant3Q#W^;McjxvwRx3b^!DQw*@Q2 zPQ7%1$KDB}!JD2gloTT61Vi5RCs0s`Kbjt#VrYg*n@HaDPbr8{)BhrtyzJ0u@<5@+ zT*@p1HuWeC*XbZ#HdJ=t=u0yvq^74HtKrh+t$YAbcFRLH=riud2x&VU= zQI-jL_6KNTp{8fRrXG6X+26uPBV?#2m*fQp)D^N%JpjYAAHDJcVD`zIp6+QR1*oS# y_;tSUBcNFjkdwyz2LE(VJqf}?S6}r525)(qOg7*{0RkZf{0;+Niq(SPzy1fM6P6YL diff --git a/test/src/test/resources/hudson/maven/maven-multimod.zip b/test/src/test/resources/hudson/maven/maven-multimod.zip deleted file mode 100644 index ffecf2a09302297b9848ab049a96eb03ea880a67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8707 zcmbW6c|2787srPtX6&XBLK(|E$`U0F+AP_7BBP9~S+Zme5n60nQxqj+BD9xntUU>p ztf9r8q}5)MRDSoG>dwaG_wpLA@z4AFz2|(+`P_3D8!myPVK5j1HnG`P^Ps6*L@Nsn zW)FwK*kPhDFHd)c0QUoCcqDAe3!=UW`0)$igt5TiErG%2e#M*Cdvq!CRlJo&*tnhc zNz<~s%{pXhA@0FiBICnp?kd|h$SEPMe$-~y8T4wen2efq;gP11UG2}_z`L_z6FWl) zqLm~OO|+Yay_4`(Ru#YP87rq=^Ss5`NDaPuRg<^nV)NIE5noc^U5VzI6IvyC=Gekd zMhDHi#nB!IEZMgTHB~5n+xnQ8fEGJdbZG6g;mNf(Ezv}{Sq^-9nX6#FpcSiulR4U~ z$YqF>k8l~g^7Q5Soz>}2%$10D*x%l9%@*vJkPgFHI}{22Cp?7_g`eM;oQUN2s~TLj z8)+r*Ova%1zFu)2bj<4WISGTQ7Ry&1IF_h~-MQQs znab(Ke@^oj@|@9+cIW>62Z!I)A%bdy^U|HqwXQh&;95tETBo-?F^V%=Dm_VL9cg`Z z(8JGrBpqxbEjq#-htE3+$g~_Wx`^0VBRRoV5hU5OY*2@QAvPs`wXiAZ^%(zV;Q3^- zqLYtT@}K9yrtAE5W;Q;lH^pZ+7ta{(3y$di5nFLFv0Akq;oll7=kb%(7?1=9APE>O z*LU6Kxi7zdApl9Zdph_XaMV~krwOFeStDuSL)OF>Ksj?_f(S}}TdULJJG9_Q%!o|jyT&+T~BrJGrC zyg)#MSYa@kg`pZ=UK)5H1Pb82=kk(6iZF0fq{~al=_-%=id>PSfgGz0FBeUDvv~K} z-DXGJ=yE(G<&&o5@~Y=;HX8e^UrS<;^y8?1g$GZWt}Ryu{;_DKWMqOf_a3qLk{P06 zSFLuhiV_hUv%9adBALr9<#H&hS4uKS^DQD2&4X|omF0IE95|xLtsKUKsk~{*z7+Mf z*0~Fol>4ozxzsHNr4pX%m@(yzb>8(XZ^vrcTM_d0Ywsge#BN@=aphA8OR6!)i*>?X zeHL;)oroj}?F9Vy))a!;wV-YRjBb91dbXG&-)hd=59?UFR8#Mz4jOE;ck$lo{oZ{X z{(P&+9NldOZv#j@FPFxch!#H{ z?6|EFqL$v`()-TIdsFS`g~{Fx94nMu`3A^5nB*a~jz(i!4{uTwe1+YAu;B_ydLT1v zckqS7&O=!ZEuuSg>(p3QdVchNn|s2(56)Ys$0q%V%i(e6sBqq>o$Jy4+ojKoS@pYD z{5!7R#OHW&<p1*!fRWA~Xlyp76zHiPand~FBd zKJh$X745{h4I{7C@6tf-t$UQwq8=(9!5%J1cApVj3uj)n@XwvuJRDMEu}}P2usbKy zFCKi3mRA1lKBj-%=hmG2T>R}m=Ie#kyP3F8bscN@0`9XujLLl+f4fg41NUJjFvxwF z3W63zD=?_B&%Gxw<@GZW7{r4FmcvY7Ae3jq)i;vPeaHf%fr0{q+y|sH5Etk^K)(jv zr!Cswd28mfeRiYwjFrNbVQht_4Xh4;>0a=PE~Bn zF`Bx!LA)f4uq&-@Q%D?Z8{04k%L?~Tdiuw4j;t=mE5{PiQ~( zoS7ZM^$htX+`9_R_0e8*)B7sjSwD-zQTk zaHb>+F5$S+A4jlN*Bu}fSn|uHEGMDg_DZhopJ1U}3) zwWX?PJSaYjsDVY3&^0N86=mt|ypYhD2@LWkrh=eF(FzP|`*YsJly{4Xz#twZFnwkM z1EJcjsA~Gjh%7J~C@3(84p#eAH#HAx&0?hYrE4n}Dt z?i~sUGe|ZO47l}Oxq{Hp9ck8iPIbK0WVrhII!odRXXO(e8)z~Dd)Jbho|Xi_n*O1( zCQT}90$bQD{nMQNV@*-&{sE$EUh7=SB~M1XOPf@1@xwCytUqQto0gzBTs=F$(P(sy zRJ|E%16P8?*>6V*H)8kN$~hxZPvY`7i=TZMP)-<73F}U zC}`xt3?PDQL7J(2AtFB&@d6F;R|{A?b~zRH4I}I?Q)JGjUlvjZK?T@S{0=D?gt;rv zv7yU@t3!q{Aq#+haY!kE*o6-OdKu*!5qKPMjmYpcvO;KcN}Yl4Kx?6VoL^4CJW8}! z>I~>EWq|$b4A5`WC^L{UFB{4LxLacw6LJRVH*1s`7+UxMFay8b1PBwjXItPT`UMx| zNzH6fm?(>$Ntx2`Tqxsn8u1$nZeV~bg3}AbD>B}kP#1k01?^AKgA?f@h}4o3Mnd=d zQ$ceVT_l!Tat@5JkmQ)K>31}gAuXJj4M`5%r!b5OS#tFI8cHD`fmD#o@Nc#^Ku+g9 zjd4z?GjN!b`ZTEMnM8?xaX}fST1MEv&H()qgOV-4#o)>`Z5LcRERX^Eg$88?To*n7 zDEi;)4IuhVPNH8cP@eQJH}oi!MbD&6>4#a$_{j7AhJvFla7FOFkYO;$0-=4)r!IO= z3fiBd2VeCUL8O*k5e*Tln?+)&iynB(`BgWxljU3xn6T-GU&@dg&&!4`4-TpfV?r)^ z`azgd2$vT=0GwLz&_4`;oX&e1NPr$CD*l zZ{;qX`kltPprU)$hqi96&W)-$=GhSw<~(_MAZFeinVYfKC%)VF{O;4AGWV{pjup_F z=lRy=I@9IINi0V%ef@BXY^A7El+jXbv=fPHa&YKF$3NA{nc>BJ^^5o{bryrMn z-%`2sf?qN7@g!NX{KC_!ggX$Y;Gd?-{otwr-mDo3KuzqzvC1mpKi*_CooU+a8o zj@YG2ZT{mG_p{ekc4kH0^XxxtD6%O*R!+&qQB1jJi)rzq`ZSx6W0guhSv&sq-T(2$ zV3ks-LEC2I)@Vkj3lFa+Z#e%*M`0~63b(Zh?FB_)J1h!~ z^pT^G4;Y2PKy%QNL2uA$NEB)>y7Rbn;qp@vkJy5|wM7;4roNtWM8G~}x9895H!W&w zT~z%(o;!Eu+%3gxGyM-bmj(5H!05Y<(M~da@%(=KdaqXHcQ&l&!q5USWe^$O{aujr;k>gF{VLoGo0eu9`yc6 zuDa7vztQVem)r3rw$oQeddbhRk-6NverDR#fXlz)*bHTo6}@kDIyZ5gC~E0nw{YHf zeqFw;9~lc5>s-G7a<-hjTj(ObV+Cbu1=h%vy46@w-|_g9oLJC5()DJNT zS1|}N2pE|ROB!t<2En5fXdb9g#A+U{42|rt!$4zmLD?H<5GZ?NH3;G`%*>7KFa}^k t0~&MUSHA!N diff --git a/test/src/test/resources/hudson/maven/maven-multimodule-unit-failure.zip b/test/src/test/resources/hudson/maven/maven-multimodule-unit-failure.zip deleted file mode 100755 index 9d1d6207d4c281f9b172363ec1f6fee976695590..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7771 zcmbtZ2RzjO8$Vf>WMz~hmCf0iMfT3#JC~99b7q(9lvOz^Gb9(^&#S*Ek*#eHDx7bRAuR! zn-5kq5aYGObKiB58CWQPgC4b!VC`-{no7Q37Pnr+S*F-rWT^bRSMR&E4l-Ox(m*nZ z!xy;rJ!NYX*{`2*)RhUr#awghk^rO%@Tdcw5^Z#a*(oXTUk5LUg|jon!3pYSe-Xxw zep$m{`v|FjfBC2HhR@EkqTAKS*~x*+)4@JmTf-@VhwN%=!MO@cL}_nsL+S%&)r7Zs zNge0m_l+Mj&sCS&BLaP@iv7+N$@EK;t*VH*hW66D?u%*an8Bps`;RG4- zH%MRCbt+P%@IpOoxw0XbdB~6@n*9R>XL`DN!c)H7F3%<%*<6B@_-2A7fpqU|)tUM` zs*PFD)seY>R%eH9w9_xqPn!FuGDKB9F}Jzij%)vEu=htP3|ZgMH^D!^SioSk(k?4u zcl*bU7!r{*u>ecAZ~{4LxxPydO*5}njx0&G+I-GcZjFxeyjel%UmWc`B+n+^y~I&d zpUv*osZPuSW+uryweoy2yOfE;95=JW{8=Kjl1|uqLRd{B@Vje_hI9bud?=auauMCz zl4={VkB=7f2+M|?IZWyo`e`BKk;aJ7fbhV=*X>s0NpRSDrJFSAY*O0aR+wy3n5{sP6p3&3)=aP-20 zC-|T6fT*#7x%0_K1viY)vKcK<8?>>|8*7D{DSC`3Oi5>FF4R|$@P{M;Jj5~{K6TMK zJb|RsO8qfO@k}q#Al+-@nqdHQF+iEFQUMoME z<*w=lX6EX-?$TqICVbfm?&Me0GZiklwhu+jzDsfSVZf|PfCn8V|Bhg;7h$egHUc}r zHk|)2f}s)qAA)U1L2n*1CGyzj3Yin)r!~dFjkn*K;}Xqvl(P8Iq+f&*GWR zkeMbSh;^UWIb_*oi&06%Gvkm|2Mq>V(U>n%N_ZveXhjz;W`q62o!bfy*;UImJ!fl) z84_v%GoS85_UC+plek7`R>xNe&dOTE7)ZxxpAcQFqY`gzQ$*e~@ywW1EhU+f5g{zV ze>ZI7_Y`iik8PM`khy@mjIE`YfOLNOK*++WQRn{PM%^cm+WUl&w5G{c%TiYiDw~fO zETu?Hr)P!VoKZq@Tai*GvoO(i262QVRyLw??{vTnBMu1E2t;PoKJR?!cSsR7@A;re z6Se0&hl4(@QZ>(YlQ7la(i{$N#|wnoRGe~pB6@FHzPG5Rs%(~^rogj!F;V=i7+j1` z;ySZ!`NKz%#jatW1coAWiefrBy$6uiWmAb14sXS*xfTjbid`oXlP_@I9i#9gC>>F_ zLsX!rd`8j>d}DOce44-CjqXGKDUaw0%WqGNDcA4%=EZdRL6Ip%OK;_1sfQoGn;MK| z@*!_;=xr1n9G^6Aj*5s31nYbn&-`(L78krejIR(d)De_PV{ZJN;MLg}?PL6HqWnrC z{@mZ_^TK-V3gRdfj(yh(II|`f|Nf0GDG6?tr7MC;&0~7l;?ar6m8`yM2j!}$=Yy6H zmJN!n49wuN`*>+{kV~ECvsWVfCVx&KxE#;g=G}e22wWmQL9qbwsvq2wlZR08W*~bQ z#0@OD!se3yOyMxIG7|JL@VIzk`;oznO;o?VySY1KIwn9CM(O=q78c#>2)}>qvFap{ zg|Prxm>uqZ8R*nk#&ciF&0a3kv&>lOQP)tHG-k#HYf%K_T-UZL*MD6bJ5kW?=853R z923hBJZEh&KGbV?I=y7nh%AsJIp0sAGVLbmfy=TNVqd^p+?faAdO*6Q{LzE_rPdn! zpC5sKOgCLDIBD3-qZ+O21D5&5x?rM4oWf&6em3wW+Nye}brH`UJRB|KfI`O`NAn%l z>$Sd~Rc;a;R+2STYPKPDI;LmnNI9oz5Lr}TFq~F@A*8+Kt#E0j%Dqvo#l?}ig{i(; z{&czz;5J-b-6rCYln3o8*V=IeSDj~X7i$+Tn%2HqWW6dbNe*8LE>Oo+tb23{>5!x` zPZ1e3?J(a=1D+EoMRpM#UXq)5)Gq6CfhSBf9mZ$dQwoWey8HYX4xaUW`=z3t$~OmYv-kx}K~QMDe^FmOL1;=M?_M03cC{*d)A}D1e7j zW_dNlsQWaHtDe7kXHZ+Py7E-+3r6#hdh-jRK4vtUHnIG#?$ipdiroLGgX7d0h&0U3 z|0;cl94z&s8TvlEPWW+;SLahml$`pDik6{!v3L0DK>JVFLk{h$&Tuasf!TN#M7mNw_*ATOD?9|w^dp+s=S$$w z@-!}L^Pj2T$4Lj~*1frcJ0}E$z_*)sOr5TgS|1PP)d@W)Rl$vB**@){LfeiK#lqBR zRk*aH3)t!gUC(*tpp}ne&qjMGzxb9ADtSAuw|HHDdjPJa?ZyYhSo;5Zt|CyB{ds8-Y*jjd#+ES0#R=Yk->9wP6?t;Ff zw05v2m=2MQj60DbAt0}WP>SN6ijZrx-7oFL!OLzIJIZ?bC|8wth2hoJt8@rA(kvzA z&&R7W{b8K9HSRj!=6Co3u4#RGnaYAhhOz`np&iUhe43SRh=u}@TpSuxLrbLL_f6o) z7ik(-UOEA0trNu1VcrC(xA?3+>0+m4Jd+-Tk*oFCn_oQ8aYta#LFHBIzGMp_CvLVZ zk*I37gk-&kqK}idM8-qF63GT zP1gunOd{{6)ejui>R{I<%|f{P(;pW$d!1cg{(0a~N!ay=(m8S0+R9a6Z!M=7q$%~Jt;Ot;MWbmXysCes3zX^HAfD)5|y#B`Gz2=`-?vEWKbF6NoQQprMhu(4+6b+IP~# ze4>VLi2_;fMD_FzgDQ28GlSxZ_&y!+u>3eM+riov#ljQRP}JX z{j4RTe27517yr;cZa@=5uWxn6OgmATKHAcNCWiB-*vB07*6I$bIEc0`pt&=~W&qhb z9Lxj*RSrTMH?U$mL;XxUc3%@zc?fORSaCMfk=?;iY94JFdxLGJDZ3-0%13A$|3k!| zT7P#`R5=N4oOsw4Z@0n?w#`AQf3#isPxwED&GrMZwIH*tmJVwB&wT*3fsKR++kCc@ zqyeZ??oPJNbZz&=-%b*I;2`e-_Ln4)|3k#TBT4vQpl&S?q1OSkoU@%I{r?FclO(7< zwiYg=&@2R6yg+jDCu_Z9h4NPc2{XWLRqfk@WF7do{&t9Ln1L3h@6jd> zABwGl45jzc2K~)0D@wVct)CdP`@I4xO39(^;K7~z_Y9;cWrsGY-9h#|8w_X| zpmk*rq@TJE%~{OFVcv%JMU>D(ThHzt?84lwnhYiU&_)IPPPxlqH?e-nKx_ltzFkp!g8nPa zFpv0F=>tKJ5@@~qW6VvlhY7tk-$Q99v~`jFQc~*5sA~cQVgNq-fkSr0FfHs AG5`Po diff --git a/test/src/test/resources/hudson/maven/maven-opts-echo.zip b/test/src/test/resources/hudson/maven/maven-opts-echo.zip deleted file mode 100644 index a0c358b94d577f1594658c3eed2ec87a7fd51b2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 623 zcmWIWW@Zs#U|`^2SZy%Ddg27fhSQ7;3

k7}yzP7z*-p^(u06LPIzim=#}Yc&h<% zX$3a}Bg+eB1_m(E8xos++d!oD{d$hX_0#5T<5ynMv^V#HS!<7>#Nv!eS*y3ICVKiE zyHP*i?u|>9(2d#ecFI4WbK2E||JBss-8a6^H7P%REoyJu26g4>4H-_+d{-_USbmmy z53A{l=_`x&nm-EId;9HycWT#SuYcvLtKV_|*RgpaPEy_~PfxEtdZ>JjZ_9g8)i8~p z@+IBgqJk@q-G2USCtLO5X*Yrw#2MbJecb%Q#2ZD)f^!y6P;3^} zZ@J}c#O!qM^8Sf#C)l#DDp&A07tPTKTd;0h|NME|=9|Y0$`~hkR@w3Pop0E=@UXaz zlEkEi9ffCAA5Y@SW18T+UwFdLs?wk-$C9i*8--4Jmvm9*J6jFQYNuKs=~Z8H6!%V+ zia2%hk*DFWr!M9f74BN@H!Yqq>yhP|IX_g-{Ps9K)5`zM)Nhw^1v1&yS6?YQw~FL5GG|$?{3+wt)(=ts4;@-q^l68i|lPl|8Qut)%ij-}L z<4J%0rR!l+V9CrMoV9M34>B3%?8s_lGv@TWpDAS{qkj1BktfTAOYgUB+4}j|%*k^UjI#7Z{Rdv}T%VTgc`N;1xq9jS zuzx%&KmBJq7(OF=#=2=vOn<*fr?iK4UtfQI_t$5sztwvtJ8cj9k*8muHPc>vO3cx{ zYv=ja+tmKx4gkhH7ck}-7z|5!ticQ@!2*o=;-X}IaJ2K9H+x};cHFu-p}I>_i%ZBf zf)Ck?$Yte`9i`y8N`Fx!_zxaBI*A0QJ zX_fbm&s^ZSE^xMv_WD-c)B1-v%xYuIql2ISW-?hQvLV%I+yC5+C$DqO6; zxg_lS4sEBtl;ScE>r)CrVhR1hEZd4r8ck16Z8&!6(Y!~OZa?B&_kY0-zrfz#f5qQk z{h~Li`|-AiKQj&8Kfd&ttr&dUo<*qPh;`Sb+b$?9AG!tSepJKz;KCT*CI9{Rrl4a9^J3z-KrD0yn5Q=OZ=(4H&Whp z?pmg3vP0rMbDZMOpDNpTEZ%W<@8t_|PkR)PF@90(_}71?OLgACvk_CG&r4YDyn0V< zMT+q&Ci$uJkCmrw-jev(jO%!u)K$Y8-NT}<_Fb@k`-L^Yn~_P58CQKF0WLp)*@aN2U^VmF$`A`1Tl<(L4e_{<1e6@kOB#45~x5T!6Z%wWRom_85v{}G!jWS zjt|ASYGmV}sf@6hn8g&b6AxpUiEu2aXu;}tTtyagln4N;Y`EXSjs+WxR)7JWkJA?H zafKSf)hrNOpm~>YXkg}CM+AQ<6gZzp(c-$QFbthb5jA7Zy%CmLSOD~m!?Q8$l{@ftL z<<}rn^v3hf%!hjE9vvFG-w)&%^6fP!KRtJAR_{j#eg%QhDQ_7(?>;Y>xZhZo1PS2|w=Y7ZKFp zH`l-F-RgE(C)>V>XH(-p&MhDBzP{1$KvK+Q?lix@Ia%Dtgls|^7vB0b&8S+Y;;hqVuC(ZlSh(uWzhD1${N4D|_k*Ie&I^W(g@IxpF9+ST=DpuFt^3*4 z(q$P3^cN~xWF1yp{`*(600&=+fawAU69ox&;Rcysvm4I*xW{Q%F8A`x8&AXS@~)HT zXP0z`8COp<^U<*wsC9Yglfx8%*-QIFCVhr zti-ZJQVkHsFrXy0xCFN;kfaXsxxz_N?iQfWmjkghc2gV+3iLpZf(HmFP+-Ylw|67o zAp-&D@4vY&ccx|7FA$clW@kGha7m-fW46Z5CV^M`i zQV<3poN2e2EWXxp3coz&fml@a7)+CYtqTQBa-dq<~O%JQkdj?>E!?S`{T{y z%&Yf0C#b|}r1ITkZTp_V8y6d7I1$^nN7MHSyj-G} zIi1mxO?$1Tzpq7*Y`RGDwxh~__IMfobusn%9=}O^bFtwL zi!)Mk^3Sd-*v-joHC+1d<@`^EAJklQ(kj`V6JqOL&ijy8W?wT$(C?LWfHxzPI5VzN zpBG#l03(56Nh62}uLD>ibwFqZ0|Uea?8%3P0b&9Jg8;)@$B#gRAcYE0J0$<$*UpKe zT?3d9K-!^&3z25;41%U>4AXEGGst248oOzTLI=ZC?BR_X zV0)P%0fx(E*v&u*6ASe21vhA2BLdykNihFp^DWGAb# zmEZTq)4kWseV$*vzKuV6zt1_J_c@>QIVVk3JbY3R@<(3$jNI=(to}j)Vgx~5c)+%{ zJWv?K!P*qgr+bD3gcnRQrqv024$iwkIQY{zAP_zc@J}@V02QqPqFoQPg1dqjwK*OV zmlzaB7;?O+$+eLj7X;!U0D+h`#j}M$d7Yuwzs-~(Cs&JHZ>IklE!abT${X)8Wy?&0 z3))j(#y;gxd-y&*x=GzN&7g>5yt2SL*z0CRuDfiGeAh|JU*qG8&q{^BVx_5fMUB!m z?U*%AF(|RZb%~23>)vS?29M5hn6xK5y}amE-_+2T55KBtStG_u(t6AgPs>b!g@yKq zZ^9#XNQ0x^*WAJmp0-Q3%lw3+n|k~f57Fu!qiT}mg;#QNnTfj1at`r2FKBX0KA>`g zz^8+rB|yym#2?C2HFvt%|JqB@DLz#TpDllx%F%oNa46>&YVP=W&4;CesUMtQ=_;fW zK8}1%I4vB1Jz4E*ZG>9=6Ucnu_?7vwULOSWH1n{LM=WbdMTwDxHv-T4TTlCP0lc&J zWyg?EH+v@Qg*k+Rj8)*WPZ+sGoRp`DgFm6-NyU!K&{tpI%#@y_CVs_MJY5a)n0 z8jsvi+g_!k(yh~6Rkg{SE-jj5hlx4J(+|!)A5Jbf#ASq+*ktr93R2D_ZayTgq2=|{ zK1}PRC-e3I6-Pv!&=hfQQWmwo%R=3-Tc&BokniCV z0ZOznYedVismS1VCM&|V-dwmV8MPLZWlKyb*wO||VD{~SFM}PySfU^KOLP+$6iWud z9WX#$03KVgjSH4sqF8YORd8EARJH239A0}Ds9kx$Cyh1V30qrU=x_Fr-Hukz9@ zoXlgOwe%SAiEYJyU8_pH znxCwEi0j%{&cN;wQwt|@>ua(fN)B18#k~NZwphLwTtMb8$ii4ZF<-9Vnlc!3)vK1= zP8{y^Dk{+~gI12B;i|{1g>ZdC8ji*XmVR=)mf1>wQs)O*{*mEqsW~*7&$)!$oXMl7 zDV?XhC;OuyS=7Aa0VVE($#Tlg>>%8t$>7F395aon(7JOXx+MDpd?|-_EB)liRacQ;(!dFs==n(H_U}n)%Ws^>~ zfh+3$?0dH`Y&mqWlzKL;P2n0IG80kNs5|*Hhz~dvW#CXY=*8AHO@Zs1rdvT5HJokE99mP!n0e#N+@hkbB|bUx0Rey<3Rr7!w8((~ZZO)A98 z_IlBt!C|A14X4r1;C!~C@*{2;FCvVN}F6@z- z>;8(zdDG<#7nPj4ptTC+l9H_Oonm}*i;rpU_wYysMWsBYE0+0&hxecgVcD9lf*h3- zPNv3xaw~qPodo?l94Oe))W*)#7KUXdW!wT0`})SQ4eGzGX`FwJ|0mWv?%L2AhSf7e z#TpqIln+Rb)fbZ;42JEUCb=V@(D?*-MYcVCR9S$1q-%8oN`fvC2&DF}IMHn20c_v} zD#}(pOO38tKr=sO`K-Qt%O#U1rh%FRW+#-16L?DFc6~0e+ao5z?g)|k*?4(bsxLtJ zRL5RMS;j~+v+lb+W!X%2xtXslUWW{7zp2|3a`zyIU<6$2O`Rc&^b1(6*wK{Gr7FQa zIA@3FolQ<3uP%zaz(M)cvH+}{irdq}Gby5CO?4+~OhhKmsg$X`+^)zn==9`l%@{Q` z7Xv(Y_uhS;+;7d>C19qC{(V0>YT_PHHc-JbS%T~E#~h^9m9*qJBXYkzoDg>)AZDK9 zPS(sxkr}Y$;5x(f>733Lw|0>#=*#EHg4fi9@XQ>%*%-Nw?yfpsaSJE$aUSSY^Lagd zr=;Da=d-~D-#==Gt4f~8Be z=Va}GYuR&==hG#j!0N%{+{rNnY2o~J1#;enqvVrMM+1hKE6tl_n66dk2bW&;n2I+# zPQmfTb}p)^!pP;!x6Hul41|x2cb5|R;gfp1`KsF!c=wA_cR80`kF^wU8)KV2EDdoi zC*m~kDjk*04$^vS{8)sN?aQ=4qp@$&)VJ@Yivx9~cZ3ctu^D`i(|S*~MAduizAq2K z(`iM9XoePk4~_DRY{$}Rm}S1H9SrwfR!)jHL{(+vK;h{v{Rmc|Jx6|8|F!ygp%9U+GC)v3 zSV+)J49qV91{;Hg&5ZelAjYO*5&|XyVq(BwG4F4WOy}~$fSE^tPy0VN6>b3**veLd zDiSIXKQSJ^YM;5?k=FSKS@L3eY&J8*&WLemX)>XsB?layKV-o)xv%-hp$foUJ!IQ~ zwaLHhEDzMw9t;87gE1yM8$5-e_j^b^_-Seq~f;{E+lLk@zrmRk476 ze}|ZkPTWPZ8$GjQOZyV|5G5KJi;9juN}i2y7yVbMBVS%{eT!#tJqnk#_1wz2J zbl_w(m!1lhcU3oODVuDf8}|qLlh8=1u-Z8KYgUWrRq!D30oldHQ1Q6E!Z3-MC8jz^(%PcvjO$_uWGShQ_GA?@81q-x^AICgV%PoVQ|dc zo^_O^90yaLjPJ+eSb+c{ztjI=0Jl>nL>Me2C~P7oU~Fn4EGBFMHa0O45`~CK@QZ>4 zMFa#fkGZOYEc+j2Vt<9KKW5&)7o~k)%*)<~H%U~zqBTq0rubdBxmgqQ3&PY|pGhuZ zT6>#TlvWhD@Hz=WpuOv2y0#5|yuJ+{(7g!E4r#8hn;nL>+qkAN7O4#bv%|x{?9d92 zL>@A-$SylmY*;tTeE6%GK5Z3kUVUQt9UbaBINoQ>iqF2SelV1YaBvRhPaKd+5S29t z5B9d77m3g7zd-55^(ez#xjZg_V%Jp#;|DKX8yq=$T=jt=pX!7YRh`a)>y>3M_d@}8 zU~amjMj`d)wVtzr10Ud$7r4a-dfhEtrx_}0A?7*!5%@Sd2A)|qKKnDEziM?BkE_0t z{H&sIUgfm~1&mSuybaB`_PL;(+RV>!wZ^`PhWFwH<)@SSb$)f48O}tYz`3F0p(OQ$#LAOSs zldtKB$At?zKakQ-D-Pu&6zq)o?@GqQ1ufeOctYi3o-^X$o2PXyJkVas5L5Mdl9cnw zR1Lw%Mt_b!?2`xLl65e*Cl8Ib`!B)B>6!a*N6w+Mq%vh;f*&+l1SD2z-M&~6j9vs6O zdypLKTn-2lE0#QJ(@N0TM{I_#Z^kor_MX_K@N9M^0p8IpDwdJEEHyWqX^Bn~h6e}M zb$ZI^y}hX`IKK;(*lXv3)ayiu{cMqLL#%%>Q(XTbKpOWO@L!BnST{HGH!94|eA^aw z<5AH1rv|3INMx8b7>e!Okn1ljU%~%9+W38?Zu{0ib|SLpZ&>jGWghtn?Tkbb2HSQ> zVhc900-Kw%0{-*g`d+WOjfP@K+f44sVNVX#+8J=DiHJ-KtN?tv^!#HoGt9)GLh?eC>UTj?5_%67!_J z^9mA2eMJ{!ad`J%PfnMX7eL!otxd=+G_>lXzJeUjDRsqdHHvcenPwVJJm6+4@bPTx z>Oc4Z-FE%XMgP~Np8PcOv-7?eT1DvW^*xMQZZ+P~R2@lu!EWSRYh>(q(~wTv;(^ec zh-%S!iL?n_99WB2=lSG}#gh?K#BwiQLp~+fh!?fFw3PCMC~CeaYv@g4P<}d=_vsP^ z;Q@w&v`>uKE=-J(Pt_YnmDFnr{5VqnLU+oWS>U1_h=k3WXAf>=f@47++`>6C$e!lu zw_M%({=TkvVcKI{^gI*19%`197tdyAQI>|t{-sQBEL1`?Hau< zPd=(mN`y${rIp zoPKp3j(rfIz?^=~f?Ze929{CpBAle%lB>*>?&@&?StQ_ z@;$=wIadUKpLqGzbGF32_`M5DH?GR~GdoE71bDd73f@}MXS(v0QL`!doMsY4_l9bp zJgruC%|wt7&jRmJ%QLjKA-$?$^v7sBC|hEKnlzgNFVJf*R12QAG+A;EI8b zvFiX?J}N5g9>36y6Kq{;Sj_tjn}uA0!z_vR-&0N1l7 zNj*t(n=sF3(p|GjAfr4n>$X8yjC4TB&my?wekYas@Lj4A&J6{Wy5#LWXCFt(J4dJ8 z-5UTF&9WtEI}vF?_ti-aYM)QAvd>?WcIcq%xB2Lxr`Ch6Z~zq&z((%&H^fHON6gLs3O4X+1SPmf zY>NG-asU(?yadtBUt8iCK@l;*neI-fW64g-41RCdW=F7wGI=tS;9sU zj2P(STcBfGpgAxYbPEF!PCc_uu-45sF9)0~+{AjU2Z3DMT?UmzLzm!2Y=?f*c$AJvV1}3cx z!nZOD6)DUG47ypNRR6VEE0gcPvkP;}f^L^GHMVxGAIAUA-EA5QC$r zL;w*c7!fo<1ZXP4x3+fP-L$<;V{;A@+lpVG*)yzX=iC(jKCk%QPWcC4 z6{Id0=I)qOIYmu_$!FTCN1M(qzJ55lMtAk-#zQaOT1fxe(bv|vM%7l4DaNXIx|-r*%&k4SuyFB z!Ik}I55#vd9J%|dqfbN9M|2`9L&SUfo%{t|RqWQpHId=dDlW zw`>uX+#X{5(!}`A={q9vTguW^)(T1dTQYABpWmImj~_ivjJJ8qCsDTf-z2WG*YXoG z{}mtZ>0d7?Io~Ab(dYORPv`78a_$(f`9HnL8fH+uAVT%Vms&1MV5lAkhAKZ&%%X=b zD3Z}4xOdXQyh8>&ZSQNlw7#poy}`IpV9V((o(2;VF0TuG zR@MLCX1{ys=HS?+?ip*YWOZ@PSu8T;!qSl2n!oPsNlP|K<}~fS*Ie-OlHs^ zxZgQlJZEXFxa668zzpekmm|!hH$~~4Fg{l}?_Tko9Lb|PKQ{CSzG|FOyFlA3=s(N% zBgwH^x3(R9t5Grk(;kKU-9N1a(t{$8Ph~h#qq(+}^J@5=IjwzDc(!al`GIXpa-zu7 z-pTecJHAh{+@RO(=~Y!_k|$kjFt>Zse~o9mqK)fc<^27)DQds2`4pLIkD`@=h23&u?9N#CV6G@a~@-ag%1hEoD%j9hm=+Rk{T3kXfsIaFD^ymZ|MaAeum`7T4 z{(JBERRCBDl>`*{A9EFI#d4t`_KQlr1p~Rp}^p!Q!K5$d5#-M=tW&h-xFaaYW*d~ zHY;z-@%E-%10Al=XFHo@zAa*yX0>J7fzt{7A0EXho(y_MOFDEKNlRZWSXriaemfQ&)uGjZ`vMx zV*7x#uFlb{-o-HQd;BKz%Qqd&dUm%xUw&2SNV}wSu zrM{Gs%0bLh-$arq*0Cr&^UhpYY*BygY~%|MPygMsc=R1D#oPkptbU$ttv)@I z`Sqn4OO`Blf4uO@)Xdl^e_Rc(-<$O_c=_({&)>c)-MoCsyE7`^7v7yXZ>`ng6pMF_ zZC&C8`urC|&mC+y_4oR;gyEy;8Net zPaRt7FOJ8Z!4ajtkv=s_eTXSkDfN+zqDnD=ZXRjH1ol!No0-F@)Q9*FTnv)e-bR%A zNJddHI#Ek#LT*G<;@C@lbT@*M$Y`lgZmG}6B*%=sEx^Gb0qxNVFuZjHF%i8wR!FZ7 zt-&AQO{{57aMM6NJbb1hQUhxL4&pXolYn7KBdDPVubF^`fqHvborW+BwOfO1*e#%$ zFpm;tDE83fK?%JWV5b*mD5M0(=V$CD3Zj^}2+c%jX->MaVkpMG#bzwDC?MTzDHOA9 zSx^H3>}0UnkWwC>`G}Z9E#r}6ZX#au5hXs*9-JwJn4m9YMfC@?PbKE`G&l~Rc@Fr*-*6t*T4vE?-G4BC#@eClP;bZ%6CP$`3M!e%U$f}V*7 gi<7CCLBsHxPh19N1!i&v25}(N=3rnr#tY&B01vU9MgRZ+ diff --git a/test/src/test/resources/hudson/maven/several-modules-in-directory.zip b/test/src/test/resources/hudson/maven/several-modules-in-directory.zip deleted file mode 100644 index 927ef95e7efc53b7b342f03942ababc5be65f6cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 870 zcmWIWW@Zs#U|`^2_|l_p*S{;VOOTO);S3OSF~~6F=BJeAr0P}V=7ffDGBBTURQIjP zR`)Hf;AUWCdBM!U047=|9`rw~Aad;eZ*7nFtjnxtv~H|0oRzcgjJgshF{a!q`6FTlG}}-nOPI}zLER1JLhEN<2Qj_ z4N5tGl&o7WoZ-B9!K-;8W8s7wyShYXo6bzMnxRs3ullQVd2IXc+ehvOSgGc}zG`Nc zbzSqxKZg`0nqGTeVU}?2;_k#JyG;@vG*z(+J~EA(lXddMR1<;ti=SrX?5o|Uzpa0^ ztn%BdD|WnR4>8QIV>y1}sg($C#!2piODs!xq}m@y=qax>>EwNU|HDc30C=D#l&jlq zJ?<7S3k=X7K+Fyd)Pnq6c!;XV;0RG)|HB46ZSQ}JhQ9N)y1^Klsiw!Vq&M`H!<}Us zys-;^229#|cfY!)yCnM&)xP^S+mfZ%yI)kbHQyGxiNSkDV~h8)S7BzX6*ujdlqdLZ zFniT(JiQ{~7L&}}%a%?}-(s9rX<8Sp@M%7ES8Q#9*d!Mt`CRMEhYb!qG%GTX+~$&h z+xICmt8a9s?9`s$8n>UBbx9vx(Ov&*d&DPk!PYJDvYVXQ+@qN{c?ju*oZWqWWwMZP z!WVDufaEKl_E%dp8IRtaKkL-y^J@)%)p1FfuB%;srt*40{?vmnytq%KZadO%wszk8 z)2|A*A78P5mFmg|OO~{Gw+EIqy}JElNpC#!MX!V}kK?K=O7FD&elzi;gZ_8&m=%(Q(ULE+d6@BqY+fkPSa|FK Y4Fkm - - - - 4.0.0 - test - test - 0.1-SNAPSHOT - - - - - maven-assembly-plugin - - - bin - - - - - package - - single - - - - - - - \ No newline at end of file diff --git a/test/src/test/resources/hudson/maven/test-pom-7162.xml b/test/src/test/resources/hudson/maven/test-pom-7162.xml deleted file mode 100644 index 2b6f190398..0000000000 --- a/test/src/test/resources/hudson/maven/test-pom-7162.xml +++ /dev/null @@ -1,26 +0,0 @@ - - 4.0.0 - - com.infradna.support - query - 1.0-SNAPSHOT - jar - - query - http://maven.apache.org - - - UTF-8 - bar - - - - - junit - junit - 3.8.1 - test - - - diff --git a/test/src/test/resources/hudson/maven/test-pom-8395.xml b/test/src/test/resources/hudson/maven/test-pom-8395.xml deleted file mode 100755 index 0ef0ff59ac..0000000000 --- a/test/src/test/resources/hudson/maven/test-pom-8395.xml +++ /dev/null @@ -1,25 +0,0 @@ - - 4.0.0 - org.hudson-ci.testcase - testcase-wrong-plugin-dep-scope - 1.0-SNAPSHOT - jar - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.6 - - - ant - ant-nodeps - 1.8.2 - test - - - - - - -- GitLab From ff71ab755cc11d36ae596694b7ddec18312e7596 Mon Sep 17 00:00:00 2001 From: Andrew Kiellor Date: Fri, 4 Oct 2013 12:49:00 -0400 Subject: [PATCH 0090/1630] Migrated some usages of GNUCLibrary to the jnr PosixAPI, fixed 'mvn -Plight-test install' on ubuntu with OpenJDK. --- core/src/main/java/hudson/FilePath.java | 25 +++---------------- .../org/jvnet/hudson/test/HudsonTestCase.java | 16 ++++++------ 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index f5e3f18ba7..4fbc624dde 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -27,6 +27,7 @@ package hudson; import hudson.Launcher.LocalLauncher; import hudson.Launcher.RemoteLauncher; +import hudson.os.PosixAPI; import jenkins.model.Jenkins; import hudson.model.TaskListener; import hudson.model.AbstractProject; @@ -1432,32 +1433,12 @@ public final class FilePath implements Serializable { } /** - * Run chmod via libc if we can, otherwise fall back to Ant. + * Run chmod via jnr-posix */ private static void _chmod(File f, int mask) throws IOException { if (Functions.isWindows()) return; // noop - try { - if(LIBC.chmod(f.getAbsolutePath(),mask)!=0) { - throw new IOException("Failed to chmod "+f+" : "+LIBC.strerror(Native.getLastError())); - } - } catch(NoClassDefFoundError e) { // cf. https://groups.google.com/group/hudson-dev/browse_thread/thread/6d16c3e8ea0dbc9?hl=fr - _chmodAnt(f, mask); - } catch(UnsatisfiedLinkError e2) { // HUDSON-8155: use Ant's chmod task on non-GNU C systems - _chmodAnt(f, mask); - } - } - - private static void _chmodAnt(File f, int mask) { - if (!CHMOD_WARNED) { // only warn this once to avoid flooding the log - CHMOD_WARNED = true; - LOGGER.warning("GNU C Library not available: Using Ant's chmod task instead."); - } - Chmod chmodTask = new Chmod(); - chmodTask.setProject(new Project()); - chmodTask.setFile(f); - chmodTask.setPerm(Integer.toOctalString(mask)); - chmodTask.execute(); + PosixAPI.jnr().chmod(f.getAbsolutePath(),mask); } private static boolean CHMOD_WARNED = false; diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index 86f6995a0b..0593557398 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -57,6 +57,7 @@ import hudson.model.*; import hudson.model.Executor; import hudson.model.Node.Mode; import hudson.model.Queue.Executable; +import hudson.os.PosixAPI; import hudson.remoting.Which; import hudson.security.ACL; import hudson.security.AbstractPasswordBasedSecurityRealm; @@ -82,7 +83,6 @@ import hudson.tools.ToolProperty; import hudson.util.PersistedList; import hudson.util.ReflectionUtils; import hudson.util.StreamTaskListener; -import hudson.util.jna.GNUCLibrary; import java.beans.PropertyDescriptor; import java.io.BufferedReader; @@ -587,8 +587,9 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { mvn.copyFrom(HudsonTestCase.class.getClassLoader().getResource(mavenVersion + "-bin.zip")); mvn.unzip(new FilePath(buildDirectory)); // TODO: switch to tar that preserves file permissions more easily - if(!Functions.isWindows()) - GNUCLibrary.LIBC.chmod(new File(mvnHome, "bin/mvn").getPath(),0755); + if(!Functions.isWindows()) { + PosixAPI.jnr().chmod(new File(mvnHome, "bin/mvn").getPath(), 0755); + } MavenInstallation mavenInstallation = new MavenInstallation("default", mvnHome.getAbsolutePath(), NO_PROPERTIES); @@ -611,8 +612,9 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { File antHome = createTmpDir(); ant.unzip(new FilePath(antHome)); // TODO: switch to tar that preserves file permissions more easily - if(!Functions.isWindows()) - GNUCLibrary.LIBC.chmod(new File(antHome,"apache-ant-1.8.1/bin/ant").getPath(),0755); + if(!Functions.isWindows()) { + PosixAPI.jnr().chmod(new File(antHome,"apache-ant-1.8.1/bin/ant").getPath(),0755); + } antInstallation = new AntInstallation("default", new File(antHome,"apache-ant-1.8.1").getAbsolutePath(),NO_PROPERTIES); } @@ -1976,8 +1978,8 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { if (!Functions.isWindows()) { try { - GNUCLibrary.LIBC.unsetenv("MAVEN_OPTS"); - GNUCLibrary.LIBC.unsetenv("MAVEN_DEBUG_OPTS"); + PosixAPI.jnr().unsetenv("MAVEN_OPTS"); + PosixAPI.jnr().unsetenv("MAVEN_DEBUG_OPTS"); } catch (Exception e) { LOGGER.log(Level.WARNING,"Failed to cancel out MAVEN_OPTS",e); } -- GitLab From 261f40533ebd5bfd34bc6232052e51c12c88d5c1 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 4 Oct 2013 13:43:48 -0400 Subject: [PATCH 0091/1630] Moving one test case to maven-plugin. --- .../hudson/tasks/junit/CaseResultTest.java | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/test/src/test/java/hudson/tasks/junit/CaseResultTest.java b/test/src/test/java/hudson/tasks/junit/CaseResultTest.java index a83278ccd5..c9ae7ada21 100644 --- a/test/src/test/java/hudson/tasks/junit/CaseResultTest.java +++ b/test/src/test/java/hudson/tasks/junit/CaseResultTest.java @@ -28,16 +28,11 @@ import hudson.model.AbstractBuild; import hudson.model.BuildListener; import hudson.model.Result; import hudson.model.FreeStyleBuild; -import hudson.maven.MavenModuleSet; -import hudson.maven.MavenModuleSetBuild; -import hudson.maven.MavenBuild; -import hudson.maven.reporters.SurefireReport; import hudson.Launcher; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.Email; import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.TestBuilder; -import org.jvnet.hudson.test.ExtractResourceSCM; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.xml.XmlPage; @@ -124,27 +119,6 @@ public class CaseResultTest extends HudsonTestCase { errorStackTrace.getTextContent()); } - /** - * Verifies that the error message and stacktrace from a failed junit test actually render properly. - */ - @Bug(4257) - public void testMavenErrorMsgAndStacktraceRender() throws Exception { - configureDefaultMaven(); - MavenModuleSet m = createMavenProject("maven-render-test"); - m.setScm(new ExtractResourceSCM(m.getClass().getResource("maven-test-failure-findbugs.zip"))); - m.setGoals("clean test"); - - MavenModuleSetBuild b = assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); - MavenBuild modBuild = (MavenBuild)b.getModuleLastBuilds().get(m.getModule("test:test")); - TestResult tr = modBuild.getAction(SurefireReport.class).getResult(); - assertEquals(1,tr.getFailedTests().size()); - CaseResult cr = tr.getFailedTests().get(0); - assertEquals("test.AppTest",cr.getClassName()); - assertEquals("testApp",cr.getName()); - assertNotNull("Error details should not be null", cr.getErrorDetails()); - assertNotNull("Error stacktrace should not be null", cr.getErrorStackTrace()); - } - /** * Verify fields show up at the correct visibility in the remote API */ -- GitLab From 47c90210e300afe10090b1b47cf0f393ec0cde11 Mon Sep 17 00:00:00 2001 From: Andrew Kiellor Date: Fri, 4 Oct 2013 13:51:44 -0400 Subject: [PATCH 0092/1630] Remove unused import. --- core/src/main/java/hudson/FilePath.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index 4fbc624dde..15da9ead87 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -49,7 +49,6 @@ import hudson.util.FormValidation; import hudson.util.IOUtils; import static hudson.Util.*; -import static hudson.util.jna.GNUCLibrary.LIBC; import static hudson.FilePath.TarCompression.GZIP; import hudson.org.apache.tools.tar.TarInputStream; import hudson.util.io.Archiver; -- GitLab From f1205fa4d613119909e0266823344dd8e6d5a519 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 4 Oct 2013 14:37:27 -0400 Subject: [PATCH 0093/1630] Copy basic Surefire configuration, esp. forkCount=2, to the plugin POM. Shaves >11min off the test time for maven-plugin on my machine! --- plugins/pom.xml | 6 +++++- pom.xml | 2 +- test/src/main/java/org/jvnet/hudson/test/WarExploder.java | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index c101e76dd1..a6aa1b24b4 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -31,6 +31,7 @@ UTF-8 + 2 @@ -158,7 +159,7 @@ maven-surefire-plugin - + 2.16 @@ -166,6 +167,9 @@ 33849 + true + ${concurrency} + true diff --git a/pom.xml b/pom.xml index 4110841f7f..222b5e53ba 100644 --- a/pom.xml +++ b/pom.xml @@ -348,7 +348,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-surefire-plugin - 2.15 + 2.16 ${project.build.directory} diff --git a/test/src/main/java/org/jvnet/hudson/test/WarExploder.java b/test/src/main/java/org/jvnet/hudson/test/WarExploder.java index 527e83d726..2d831b7f95 100644 --- a/test/src/main/java/org/jvnet/hudson/test/WarExploder.java +++ b/test/src/main/java/org/jvnet/hudson/test/WarExploder.java @@ -94,6 +94,7 @@ final class WarExploder { if(!timestamp.exists() || (timestamp.lastModified()!=war.lastModified())) { System.out.println("Exploding jenkins.war at "+war); new FilePath(explodeDir).deleteRecursive(); + // TODO this can fail (race condition?) when running tests in parallel; need a three-state flag, and switch to a different explodeDir as needed new FilePath(war).unzip(new FilePath(explodeDir)); if(!explodeDir.exists()) // this is supposed to be impossible, but I'm investigating HUDSON-2605 throw new IOException("Failed to explode "+war); -- GitLab From c01f2564eb5f847c0f92d7aa0c4e3702fc736811 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 4 Oct 2013 16:24:13 -0400 Subject: [PATCH 0094/1630] Removing test dep on ui-samples. Superfluous in that if you *want* to look at UI samples, you can just install that plugin. And observed to cause a cyclic plugin dependency error when splitting matrix-auth from core. (Unclear why ui-samples had a dependency on matrix-auth; perhaps related to dependency from test module.) --- plugins/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index a6aa1b24b4..f715effcfc 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -54,12 +54,6 @@ 1.535-SNAPSHOT test - - org.jenkins-ci.main - ui-samples-plugin - 1.535-SNAPSHOT - test - - - - - - - - diff --git a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_da.properties b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_da.properties deleted file mode 100644 index b51d973595..0000000000 --- a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_da.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Enable\ project-based\ security=Sl\u00e5 projektbaseret adgangskontrol til diff --git a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_de.properties b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_de.properties deleted file mode 100644 index 09962dfad5..0000000000 --- a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_de.properties +++ /dev/null @@ -1 +0,0 @@ -Enable\ project-based\ security=Projektbasierte Sicherheit aktivieren diff --git a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_es.properties b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_es.properties deleted file mode 100644 index ff2d46965a..0000000000 --- a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_es.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Enable\ project-based\ security=Habilitar seguridad en el projecto diff --git a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_fr.properties b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_fr.properties deleted file mode 100644 index eaa01eb9fd..0000000000 --- a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_fr.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Enable\ project-based\ security=Activer la scurit base projet diff --git a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_ja.properties b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_ja.properties deleted file mode 100644 index 3adb7b6870..0000000000 --- a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_ja.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Enable\ project-based\ security=\u6A29\u9650\u8A2D\u5B9A(\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5358\u4F4D)\u306E\u6709\u52B9\u5316 diff --git a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_pt_BR.properties b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_pt_BR.properties deleted file mode 100644 index 55c8f8103e..0000000000 --- a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_pt_BR.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Enable\ project-based\ security=Habilitar seguran\u00e7a baseada em projeto diff --git a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_tr.properties b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_tr.properties deleted file mode 100644 index bcc98aa2a1..0000000000 --- a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_tr.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Enable\ project-based\ security=Proje tabanl\u0131 g\u00fcvenlik ayarlar\u0131n\u0131 devreye al diff --git a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_zh_CN.properties b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_zh_CN.properties deleted file mode 100644 index d7d400a618..0000000000 --- a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_zh_CN.properties +++ /dev/null @@ -1 +0,0 @@ -Enable\ project-based\ security=\u542f\u7528\u9879\u76ee\u5b89\u5168 diff --git a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_zh_TW.properties b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_zh_TW.properties deleted file mode 100644 index cac3d883ea..0000000000 --- a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_zh_TW.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Enable\ project-based\ security=\u555f\u7528\u5c08\u6848\u578b\u5b89\u5168\u6027\u8a2d\u5b9a diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly deleted file mode 100644 index 51a70d8ea0..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - ${title} - - - - - - - - - - - - ${%Toggle all} - - - - ${%Remove user/group} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ${%User/group} - - ${g.title} - -
- ${p.name} -
- - - -
- ${%User/group to add}: - - - - [help] -
- - - diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_da.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_da.properties deleted file mode 100644 index 78c79a33cb..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_da.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Anonymous=Anonym -User/group\ to\ add=Brugergruppe der skal tilf\u00f8jes -Add=Tilf\u00f8j -Remove\ user/group=Fjern user/gruppe -User/group=Bruger/gruppe diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_de.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_de.properties deleted file mode 100644 index 09e5858300..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_de.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Remove\ user/group=Nutzer/Gruppe entfernen -Toggle\ all=Alles ausw\u00E4hlen -User/group=Benutzer/Gruppe -Anonymous=Anonym -User/group\ to\ add=Weitere Benutzer/Gruppe -Add=Hinzufgen diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_es.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_es.properties deleted file mode 100644 index 3ef3712be8..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_es.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -User/group=Usuario/Grupo -Anonymous=Annimo -User/group\ to\ add=Usuario/Grupo para aadir -Add=Aadir -Remove\ user/group=Borrar usuario/grupo -Toggle\ all=Cambiar todo diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_fi.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_fi.properties deleted file mode 100644 index f293ef2a6e..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_fi.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Remove\ user/group=Poista k\u00E4ytt\u00E4j\u00E4/ryhm\u00E4 diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_fr.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_fr.properties deleted file mode 100644 index fbb1cc44e2..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_fr.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Remove\ user/group=Supprimer utilisateur/groupe -User/group=Utilisateur/groupe -Anonymous=Anonyme -User/group\ to\ add=Utilisateur/groupe ajouter -Add=Ajouter diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ja.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ja.properties deleted file mode 100644 index e5c4ae2142..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ja.properties +++ /dev/null @@ -1,29 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2012, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Add=\u8ffd\u52a0 -Anonymous=\u533f\u540d\u30e6\u30fc\u30b6\u30fc -User/group=\u30e6\u30fc\u30b6\u30fc/\u30b0\u30eb\u30fc\u30d7 -User/group\ to\ add=\u8ffd\u52a0\u3059\u308b\u30e6\u30fc\u30b6\u30fc/\u30b0\u30eb\u30fc\u30d7 - -Toggle\ all=\u3059\u3079\u3066\u53cd\u8ee2 -Remove\ user/group=\u30e6\u30fc\u30b6/\u30b0\u30eb\u30fc\u30d7\u3092\u524a\u9664 diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_nb_NO.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_nb_NO.properties deleted file mode 100644 index 06f66ca6f9..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_nb_NO.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Add=Legg til -Anonymous=Anonym -User/group=Bruker/gruppe -User/group\ to\ add=Bruker/gruppe \u00E5 legge til diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_nl.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_nl.properties deleted file mode 100644 index c9769d698a..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_nl.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:sorokh -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Remove\ user/group=Verwijder gebruiker/groep -User/group=Gebruiker/groep -Anonymous=Anoniem -User/group\ to\ add=Toe te voegen gebruiker/groep -Add=Voeg toe diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_pt_BR.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_pt_BR.properties deleted file mode 100644 index d68585ad00..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_pt_BR.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -User/group=Usu\u00E1rios/Grupo -Anonymous=An\u00f4nimo -User/group\ to\ add=Usu\u00e1rio/grupo para adicionar -Add=Adicionar diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ru.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ru.properties deleted file mode 100644 index acd0573b2d..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ru.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Remove\ user/group=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F/\u0433\u0440\u0443\u043F\u043F\u0443 -Toggle\ all=\u041F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0432\u0441\u0451 -User/group=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c/\u0433\u0440\u0443\u043f\u043f\u0430 -Anonymous=\u0410\u043d\u043e\u043d\u0438\u043c -User/group\ to\ add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f/\u0433\u0440\u0443\u043f\u043f\u0443 -Add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_sv_SE.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_sv_SE.properties deleted file mode 100644 index 80304b1fa3..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_sv_SE.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Add=L\u00E4gg till -Anonymous=Anonym -Remove\ user/group=Ta bort anv\u00E4ndare/grupp -Toggle\ all=V\u00E4xla alla -User/group=Anv\u00E4ndare/grupp -User/group\ to\ add=Anv\u00E4ndare/grupp att l\u00E4gga till diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_tr.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_tr.properties deleted file mode 100644 index 2339130169..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_tr.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -User/group=Kullan\u0131c\u0131/grup -Anonymous=Bilinmeyen -User/group\ to\ add=Eklenecek grup -Add=Ekle diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_CN.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_CN.properties deleted file mode 100644 index 76b6f20d54..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_CN.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Remove\ user/group=\u79FB\u9664\u7528\u6237/\u7EC4 -Toggle\ all=\u5C55\u5F00\u5168\u90E8 -User/group=\u7528\u6237/\u7ec4 -Anonymous=\u533f\u540d\u7528\u6237 -User/group\ to\ add=\u6dfb\u52a0\u7528\u6237/\u7ec4 -Add=\u6dfb\u52a0 diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_TW.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_TW.properties deleted file mode 100644 index a39c6fc98f..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_TW.properties +++ /dev/null @@ -1,30 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2013, Sun Microsystems, Inc., Chunghwa Telecom Co., Ltd., -# and Pei-Tang Huang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Toggle\ all=\u53cd\u5411\u9078\u53d6 -Remove\ user/group=\u79fb\u9664\u4f7f\u7528\u8005\u6216\u7fa4\u7d44 - -User/group=\u4f7f\u7528\u8005\u6216\u7fa4\u7d44 -Anonymous=\u533f\u540d\u4f7f\u7528\u8005 -User/group\ to\ add=\u8981\u65b0\u589e\u7684\u4f7f\u7528\u8005\u6216\u7fa4\u7d44 -Add=\u65b0\u589e diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group.jelly b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group.jelly deleted file mode 100644 index 194301ba46..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group.jelly +++ /dev/null @@ -1,13 +0,0 @@ - - -

- Different security realm has different conventions about group names. - The best way to go about it is to login and see what group names you belong to, - by going to this diagnostics page. - -

- A special group "authenticated" is also available, which represents all - authenticated (logged in) users. -

-
- diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_ja.jelly b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_ja.jelly deleted file mode 100644 index 39bd6e2abc..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_ja.jelly +++ /dev/null @@ -1,11 +0,0 @@ - - -
- ユーザー情報の取得先によってグループ名は異なる記法が使われることがあります。 - 最善の方法は、一度ユーザーでログインして、この診断ページに行って実際にJenkinsが使っているグループ名を見ることです。 -

- 接頭辞である"ROLE_"と大文字であるか小文字であるかを変更するには、Jenkinsのアーカイブに含まれるWEB-INF/security/LDAPBindSecurityRealm.groovyを編集して、 - 再起動します。 -

-
- diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_zh_TW.jelly b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_zh_TW.jelly deleted file mode 100644 index 59d4bbdbc2..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_zh_TW.jelly +++ /dev/null @@ -1,11 +0,0 @@ - - -
- 不同的安全性領域對群組名稱有不一樣的慣例。 - 最好的方法就是登入後，到診斷頁看您所屬的群組名稱。 - -

- 另外，還可以使用特別群組 "authenticated" 來代表所有驗證通過 (已登入) 的使用者。 -

-
- diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help.html deleted file mode 100644 index c34beb46b3..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help.html +++ /dev/null @@ -1,19 +0,0 @@ -
- In this scheme, you can configure who can do what by using a big table. - -

- Each column represents a permission. Hover the mouse over the permission names to get - more information about what they represent. - -

- Each row represents a user or a group (often called 'role', depending on the security realm.) - This includes a special user 'anonymous', which represents unauthenticated users, as well - as 'authenticated', which represents all authenticated users (IOW, everyone except anonymous users.) - Use the text box below the table to add new users/groups/roles to the table, and click the - [x] icon to remove it from the table. - -

- Permissions are additive. That is, if an user X is in group A, B, and C, then - the permissions that this user actually has are the union of all permissions given to - X, A, B, C, and anonymous. -

diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_de.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_de.html deleted file mode 100644 index a651b716a8..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_de.html +++ /dev/null @@ -1,20 +0,0 @@ -
- In dieser Tabelle können Sie angeben, wer zu welchen Aktionen berechtigt ist. -

- Jede Spalte entspricht einer Berechtigung. Fahren Sie mit der Maus über die - Namen der Berechtigungen, um mehr Informationen darüber zu erhalten, was sie - bedeuten. -

- Jede Zeile entspricht einem Benutzer oder einer Benutzergruppe (je nach - Benutzerverzeichnis oft auch als "Rolle" bezeichnet). Die Zeilen beinhalten - auch die besonderen Benutzer 'anonymous' bzw. 'authenticated', welche - nichtangemeldete bzw. angemeldete Benutzer repräsentieren, - - Verwenden Sie das untenstehende Textfeld, um neue Benutzer/Gruppen/Rollen zur Tabelle - hinzuzufügen und klicken Sie auf das [x]-Symbol, um sie wieder von der - Tabelle zu entfernen. -

- Berechtigungen sind additiv. Dies bedeutet, dass ein Benutzer X, der Mitglied - in den Gruppen A, B und C ist, die Vereinigungsmenge aller Berechtigungen - besitzt, die X, A, B, C und dem Benutzer 'anonymous' erteilt wurden. -

\ No newline at end of file diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_fr.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_fr.html deleted file mode 100644 index 2467997657..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_fr.html +++ /dev/null @@ -1,26 +0,0 @@ -
- - Cette option vous permet de configurer qui fait quoi dans un grand tableau. - -

- Chaque colonne représente une autorisation. Faites glisser la souris au - dessus du nom d'une autorisation pour obtenir plus d'information sur - ce qu'elle représente. - -

- Chaque ligne représente un utilisateur ou un groupe (souvent appelé - 'rôle', selon les royaumes -realms- de sécurité). - On y trouve un utilisateur spécial 'anonymous' qui représente - les utilisateurs non authentifiés, ainsi qu'un utilisateur 'authenticated', - qui représente les utilisateurs authentifiés (c-à-d, tout le monde, à - l'exception des utilisateurs anonymes). - Utilisez le texte sous la table pour ajouter des nouveaux - utilisateurs/groupes/rôles à la table et cliquez sur l'icône - [x] pour les supprimer. - -

- Les autorisations s'ajoutent les unes aux autres. En clair, si un - utilisateur X est présent dans les groupes A, B et C, alors les - autorisations associées à cet utilisateur sont l'union de toutes les - autorisations accordées à X, A, B, C et anonymous. -

\ No newline at end of file diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_ja.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_ja.html deleted file mode 100644 index 2d3401bbef..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_ja.html +++ /dev/null @@ -1,19 +0,0 @@ -
- 大きな表形式で、誰が何をできるのか設定します。 - -

- 各列はパーミッションを表します。パーミッション名の上にマウスをあわせると、 - そのパーミッションの詳細が表示されます。 - -

- 各行はユーザーかグループ(セキュリティ・レルムでは、'ロール'とも呼ばれます)を表します。 - この中には、Jenkinsにログインしていない匿名ユーザーをあらわす特別な「anonymous」と、 - また、全てのログイン済みユーザーをあらわす特別な「authenticated」という名前を使うこともできます。 - 表の下にあるテキストボックスを使用して、ユーザー/グループ/ロールを表に追加し、 - [x] のアイコンをクリックすると、表から削除します。 - -

- パーミッションは追加式です。つまり、ユーザーXがグループA、B、Cに所属しているなら、 - このユーザーが実際に持つパーミッションは、 - ユーザーX、グループA、B、Cおよび匿名ユーザーに与えられた全てのパーミッションの和になります。 -

diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_pt_BR.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_pt_BR.html deleted file mode 100644 index 1b5c049fc2..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_pt_BR.html +++ /dev/null @@ -1,20 +0,0 @@ -
- - Neste esquema, você pode configurar quem pode fazer o quê usando uma grande tabela. - -

- Cada coluna representa uma permissão. Passe o mouse sobre os nomes das permissões para - obter mais informação sobre o que elas representam. - -

- Cada linha representa um usuário ou grupo (frequentemente chamado de 'papel', - dependendo do domínio de segurança.) - Isto inclui um usuário especial chamado 'anonymous', que representa os usuários não autenticados. - Use a caixa de texto abaixo da tabela para adicionar novos usuários/grupos/papéis na tabela, e clique - no ícone [x] para remover da tabela. - -

- Permissões são cumulativas. Ou seja, se um usuário X está nos grupos A, B, e C, então - as permissões que este usuário na verdade tem é a únião de todas as permissões dadas para - X, A, B, C, e anônimos. -

diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_ru.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_ru.html deleted file mode 100644 index 36f4e2b496..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_ru.html +++ /dev/null @@ -1,20 +0,0 @@ -
- - В этом режиме вы можете явно указать допустимые операции, используя матрицу привилегий. - -

- Каждая колонка представляет собой привилегию. Наведите курсор мыши на имя привелегии - для получения большей информации о её предназначении. - -

- Каждая строка представляет собой пользователя или группу (обычно называемая "ролью", в - зависимости от используемого модуля безопасности). Список включает также специального - пользователя Аноним, который представляет собой неаутентифицированного пользователя. - Чтобы добавить нового пользователя/группу/роль в таблицу, используйте поле ввода под таблицей. - Чтобы удалить пользователя/группу/роль нажмите кнопку [x] в правой колонке. - -

- Привилегии аддитивны, то есть если пользователь X состоит в группах A, B и C, тогда - реальные привилегии пользователя - объединение всех привилегий данных конкретно пользователю, - группам A, B и C и анонимному пользователю. -

\ No newline at end of file diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_tr.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_tr.html deleted file mode 100644 index 44d38936aa..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_tr.html +++ /dev/null @@ -1,19 +0,0 @@ -
- - Bu şemada, tabloyu kullanarak kimin ne yapabileceğini belirleyebilirsiniz. - -

- Her kolon bir yetkiyi temsil eder. Mouse ile yetki isimlerinin üzerine - gelerek, daha fazla bilgi alabilirsiniz. - -

- Her satır bir kullanıcı veya grubu temsil eder (Güvenlik alanına bağlı olarak, "rol" olarak da - adlandırılabilir). Bu satırların içerisinde yetkisiz kullanıcıları temsilen bilinmeyen (anonymous) - kullanıcı da yer almaktadır. Aşağıdaki metin kutusunu kullanarak, tabloya kullanıcı/grup/rol ekleyebilir, - [x] ikonuna tıklayarak bunları silebilirsiniz. - -

- Yetkilendirme, kullanıcı ve ait olduğu grupların yetkilerinin birleşim kümesi ile hesaplanır. - Yani X kullanıcısı, A, B ve C gruplarına dahilse, yetkileri X, A, B, C ve bilinmeyen kullanıcıya - verilen yetkilerinin birleşim kümesidir. -

\ No newline at end of file diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html deleted file mode 100644 index 72cdd35847..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html +++ /dev/null @@ -1,13 +0,0 @@ -
- 在这种授权模型中,你可以通过一个大的表格来配置什么用户可以做什么事. - -

- 每一列代表一个权限.把鼠标移动到权限名称上可以查看更详细的权限说明信息. - -

- 每一行代表一个用户或组(通常称为'角色',取决于安全域.),这其中包含特殊用户'anonymous',其代表未登录用户,同样还有'authenticated',其代表所有已认证的用户(也就是除了匿名用户的所有用户.) - 可以使用表格下方的输入框来添加新的用户/组/角色到表格中,并且可以点击[x]图标将其从表格中删除. - -

- 权限是追加的,这说明如果一个用户X在A,B,C三个组中,那么X的权限是联合了X,A,B,C和匿名用户的所有权限. -

diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_TW.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_TW.html deleted file mode 100644 index 18b7e9a384..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_TW.html +++ /dev/null @@ -1,15 +0,0 @@ -
- 在這種配置下，您可以透過一張大表格，設定每個人可以做的每件事。 - -

- 每一欄都表示一項權限。將滑鼠游標移到權限名稱上，可以看到權限代表的意義說明。 - -

- 一行就是一個使用者或群組 (依據安全性領域不同，一般也叫做「角色」)。 - 包括 "anonymous" 特殊使用者，代表沒有通過驗證的人; - 另外也有 "authenticated"，代表所有驗證通過的人 (換句話說，就是除了匿名使用者以外的所有人)。 - 透過表格下方的文字方塊可以新增使用者、群組、角色進來，按一下 [x] 圖示可以把它由表格中移掉。 - -

- 權限會累加。也就是說，如果 X 使用者在 A, B, C 三個群組中，則該使用者實際的權限會是 X, A, B, C 及匿名使用者權限的聯集。 -

diff --git a/core/src/main/resources/hudson/security/Messages.properties b/core/src/main/resources/hudson/security/Messages.properties index 2214960963..d88982fe9a 100644 --- a/core/src/main/resources/hudson/security/Messages.properties +++ b/core/src/main/resources/hudson/security/Messages.properties @@ -22,8 +22,6 @@ GlobalSecurityConfiguration.DisplayName=Configure Global Security GlobalSecurityConfiguration.Description=Secure Jenkins; define who is allowed to access/use the system. -GlobalMatrixAuthorizationStrategy.DisplayName=Matrix-based security - HudsonPrivateSecurityRealm.WouldYouLikeToSignUp=This {0} {1} is new to Jenkins. Would you like to sign up? LegacyAuthorizationStrategy.DisplayName=Legacy mode @@ -56,8 +54,6 @@ LegacySecurityRealm.Displayname=Delegate to servlet container UserDetailsServiceProxy.UnableToQuery=Unable to query user information: {0} -ProjectMatrixAuthorizationStrategy.DisplayName=Project-based Matrix Authorization Strategy - PAMSecurityRealm.DisplayName=Unix user/group database PAMSecurityRealm.ReadPermission=Jenkins needs to be able to read /etc/shadow PAMSecurityRealm.BelongToGroup={0} needs to belong to group {1} to read /etc/shadow diff --git a/core/src/main/resources/hudson/security/Messages_da.properties b/core/src/main/resources/hudson/security/Messages_da.properties index 912d05e897..7e84f2ae64 100644 --- a/core/src/main/resources/hudson/security/Messages_da.properties +++ b/core/src/main/resources/hudson/security/Messages_da.properties @@ -36,9 +36,7 @@ HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Brugeradministration HudsonPrivateSecurityRealm.DisplayName=Jenkins''s egen brugerdatabase PAMSecurityRealm.DisplayName=Unix bruger/gruppe database AuthorizationStrategy.DisplayName=Alle kan g\u00f8re alt -ProjectMatrixAuthorizationStrategy.DisplayName=Projektbaseret matriceauthentificering AccessDeniedException2.MissingPermission={0} mangler {1} rettigheden -GlobalMatrixAuthorizationStrategy.DisplayName=Matricebaseret sikkerhed Permission.Permissions.Title=N/A LDAPSecurityRealm.UnableToConnect=Kan ikke oprette forbindelse til {0} : {1} FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Indloggede brugere kan g\u00f8re alt diff --git a/core/src/main/resources/hudson/security/Messages_de.properties b/core/src/main/resources/hudson/security/Messages_de.properties index 52dc616e38..93803b4089 100644 --- a/core/src/main/resources/hudson/security/Messages_de.properties +++ b/core/src/main/resources/hudson/security/Messages_de.properties @@ -22,53 +22,48 @@ GlobalSecurityConfiguration.DisplayName=Globale Sicherheit konfigurieren GlobalSecurityConfiguration.Description=Jenkins absichern und festlegen, wer Zugriff auf das System hat und es benutzen darf. -GlobalMatrixAuthorizationStrategy.DisplayName=Matrix-basierte Sicherheit - LegacyAuthorizationStrategy.DisplayName=Legacy-Autorisierung HudsonPrivateSecurityRealm.DisplayName=Jenkins' eingebautes Benutzerverzeichnis HudsonPrivateSecurityRealm.Details.DisplayName=Passwort HudsonPrivateSecurityRealm.Details.PasswordError=\ - Das angegebene Passwort und seine Wiederholung stimmen nicht berein. \ - Bitte berprfen Sie Ihre Eingabe. + Das angegebene Passwort und seine Wiederholung stimmen nicht \u00fcberein. \ + Bitte \u00fcberpr\u00fcfen Sie Ihre Eingabe. HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Benutzer verwalten -HudsonPrivateSecurityRealm.ManageUserLinks.Description=Anlegen, Aktualisieren und Lschen von Benutzern, die sich an dieser Jenkins-Installation anmelden drfen. +HudsonPrivateSecurityRealm.ManageUserLinks.Description=Anlegen, Aktualisieren und L\u00f6schen von Benutzern, die sich an dieser Jenkins-Installation anmelden d\u00fcrfen. -HudsonPrivateSecurityRealm.CreateAccount.TextNotMatchWordInImage=Text stimmt nicht mit dem Wort im Bild berein -HudsonPrivateSecurityRealm.CreateAccount.PasswordNotMatch=Das angegebene Passwort und seine Wiederholung stimmen nicht berein -HudsonPrivateSecurityRealm.CreateAccount.PasswordRequired=Passwort wird bentigt -HudsonPrivateSecurityRealm.CreateAccount.UserNameRequired=Benutzername wird bentigt -HudsonPrivateSecurityRealm.CreateAccount.InvalidEmailAddress=Ungltige E-Mail Adresse +HudsonPrivateSecurityRealm.CreateAccount.TextNotMatchWordInImage=Text stimmt nicht mit dem Wort im Bild \u00fcberein +HudsonPrivateSecurityRealm.CreateAccount.PasswordNotMatch=Das angegebene Passwort und seine Wiederholung stimmen nicht \u00fcberein +HudsonPrivateSecurityRealm.CreateAccount.PasswordRequired=Passwort wird ben\u00f6tigt +HudsonPrivateSecurityRealm.CreateAccount.UserNameRequired=Benutzername wird ben\u00f6tigt +HudsonPrivateSecurityRealm.CreateAccount.InvalidEmailAddress=Ung\u00fcltige E-Mail Adresse HudsonPrivateSecurityRealm.CreateAccount.UserNameAlreadyTaken=Benutzername ist bereits vergeben -FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Angemeldete Benutzer drfen alle Aktionen ausfhren +FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Angemeldete Benutzer d\u00fcrfen alle Aktionen ausf\u00fchren -AuthorizationStrategy.DisplayName=Jeder darf alle Aktionen ausfhren +AuthorizationStrategy.DisplayName=Jeder darf alle Aktionen ausf\u00fchren LDAPSecurityRealm.DisplayName=LDAP LDAPSecurityRealm.SyntaxOfServerField=\ Syntax der Server-Angabe ist SERVER, SERVER:PORT oder ldaps://SERVER[:PORT] LDAPSecurityRealm.UnknownHost=Unbekannter Host: {0} LDAPSecurityRealm.UnableToConnect=Keine Verbindung zu {0} : {1} -LDAPSecurityRealm.InvalidPortNumber=Ungltige Port-Nummer +LDAPSecurityRealm.InvalidPortNumber=Ung\u00fcltige Port-Nummer LegacySecurityRealm.Displayname=An Servlet-Container delegieren UserDetailsServiceProxy.UnableToQuery=Benutzerinformationen konnten nicht abgefragt werden: {0} PAMSecurityRealm.DisplayName=Unix Benutzer-/Gruppenverzeichnis -PAMSecurityRealm.ReadPermission=Jenkins bentigt Leserechte fr /etc/shadow -PAMSecurityRealm.BelongToGroup={0} mu zu Gruppe {1} gehren, um /etc/shadow lesen zu knnen. +PAMSecurityRealm.ReadPermission=Jenkins ben\u00f6tigt Leserechte f\u00fcr /etc/shadow +PAMSecurityRealm.BelongToGroup={0} mu\u00df zu Gruppe {1} geh\u00f6ren, um /etc/shadow lesen zu k\u00f6nnen. PAMSecurityRealm.RunAsUserOrBelongToGroupAndChmod=\ - Entweder mu Jenkins als {0} ausgefhrt werden, oder {1} mu zu Gruppe {2} gehren und \ - ''chmod g+r /etc/shadow'' mu ausgefhrt werden, damit Jenkins /etc/shadow lesen kann. + Entweder mu\u00df Jenkins als {0} ausgef\u00fchrt werden, oder {1} mu\u00df zu Gruppe {2} geh\u00f6ren und \ + ''chmod g+r /etc/shadow'' mu\u00df ausgef\u00fchrt werden, damit Jenkins /etc/shadow lesen kann. PAMSecurityRealm.Success=Erfolgreich PAMSecurityRealm.User=Benutzer ''{0}'' PAMSecurityRealm.CurrentUser=Aktueller Benutzer PAMSecurityRealm.Uid=uid: {0} - -ProjectMatrixAuthorizationStrategy.DisplayName=Projektbasierte Matrix-Zugriffssteuerung - # not in use Permission.Permissions.Title=N/A AccessDeniedException2.MissingPermission={0} fehlt das Recht ''{1}'' diff --git a/core/src/main/resources/hudson/security/Messages_es.properties b/core/src/main/resources/hudson/security/Messages_es.properties index 4b56eb6591..45b42f1543 100644 --- a/core/src/main/resources/hudson/security/Messages_es.properties +++ b/core/src/main/resources/hudson/security/Messages_es.properties @@ -20,37 +20,34 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalSecurityConfiguration.DisplayName=Configuraci\u00F3n global de la seguridad +GlobalSecurityConfiguration.DisplayName=Configuraci\u00f3n global de la seguridad GlobalSecurityConfiguration.Description=Seguridad en Jenkins. \ - Define qui\u00E9n tiene acceso al sistema (autenticaci\u00F3n) y qu\u00E9 puede hacer (autorizaci\u00F3n) -GlobalMatrixAuthorizationStrategy.DisplayName=Configuracin de seguridad + Define qui\u00e9n tiene acceso al sistema (autenticaci\u00f3n) y qu\u00e9 puede hacer (autorizaci\u00f3n) LegacyAuthorizationStrategy.DisplayName=Modo ''legacy'' HudsonPrivateSecurityRealm.DisplayName=Usar base de datos de Jenkins -HudsonPrivateSecurityRealm.Details.DisplayName=Contrasea +HudsonPrivateSecurityRealm.Details.DisplayName=Contrase\u00f1a HudsonPrivateSecurityRealm.Details.PasswordError=\ - Las contraseas no coinciden. -HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Gestin de usuarios + Las contrase\u00f1as no coinciden. +HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Gesti\u00f3n de usuarios HudsonPrivateSecurityRealm.ManageUserLinks.Description=Crear/borrar/editar usuarios que puedan utilizar Jenkins FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Usuarios autenticados tienen privilegios para todo -AuthorizationStrategy.DisplayName=Cualquiera puede hacer cualquier accin +AuthorizationStrategy.DisplayName=Cualquiera puede hacer cualquier acci\u00f3n LegacySecurityRealm.Displayname=Delegar seguridad al contenedor de servlets -UserDetailsServiceProxy.UnableToQuery=Imposible obtener la informacin del usuario: {0} - -ProjectMatrixAuthorizationStrategy.DisplayName=Estrategia de seguridad para el proyecto +UserDetailsServiceProxy.UnableToQuery=Imposible obtener la informaci\u00f3n del usuario: {0} # not in use Permission.Permissions.Title=N/D AccessDeniedException2.MissingPermission={0} no tiene el permiso {1} -PAMSecurityRealm.DisplayName=Autenticacin basada en usuarios y grupos Unix -PAMSecurityRealm.ReadPermission=Jenkins necesita permisos de lectura del fichero /etc/shadowPAMSecurityRealm.DisplayName=Usar autenticacin Unix: usuario/grupo +PAMSecurityRealm.DisplayName=Autenticaci\u00f3n basada en usuarios y grupos Unix +PAMSecurityRealm.ReadPermission=Jenkins necesita permisos de lectura del fichero /etc/shadowPAMSecurityRealm.DisplayName=Usar autenticaci\u00f3n Unix: usuario/grupo PAMSecurityRealm.BelongToGroup={0} tiene que pertenecer al grupo {1} para tener acceso de lectura a /etc/shadow PAMSecurityRealm.RunAsUserOrBelongToGroupAndChmod=\ Es necesario que Jenkins se ejecute como "{0}", o bien "{1}" ha de pertenecer al grupo "{2}" y ejecutar "chmod g+r /etc/shadow" para que Jenkins tenga acceso de lectura a /etc/shadow. @@ -63,6 +60,6 @@ LDAPSecurityRealm.DisplayName=LDAP LDAPSecurityRealm.SyntaxOfServerField=La sintaxis para especificar el servidor es: SERVER o SERVER:PORT o ldaps://SERVER[:PORT] LDAPSecurityRealm.UnknownHost=Nombre de host desconocido: {0} LDAPSecurityRealm.UnableToConnect=Incapaz de conectar con {0} : {1} -LDAPSecurityRealm.InvalidPortNumber=El puerto no es vlido +LDAPSecurityRealm.InvalidPortNumber=El puerto no es v\u00e1lido -HudsonPrivateSecurityRealm.WouldYouLikeToSignUp=Este {0} {1} es nuevo en Jenkins. Te gustara crear una nueva cuenta? +HudsonPrivateSecurityRealm.WouldYouLikeToSignUp=Este {0} {1} es nuevo en Jenkins. \u00bfTe gustar\u00eda crear una nueva cuenta? diff --git a/core/src/main/resources/hudson/security/Messages_fr.properties b/core/src/main/resources/hudson/security/Messages_fr.properties index cb358c7ca8..9258c0680a 100644 --- a/core/src/main/resources/hudson/security/Messages_fr.properties +++ b/core/src/main/resources/hudson/security/Messages_fr.properties @@ -20,33 +20,30 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalSecurityConfiguration.DisplayName=Configurer la s\u00E9curit\u00E9 globale -GlobalSecurityConfiguration.Description=S\u00E9curiser Jenkins; d\u00E9finir qui est autoris\u00E9 \u00E0 acc\u00E9der au syst\u00E8me. -GlobalMatrixAuthorizationStrategy.DisplayName=Scurit base sur une matrice +GlobalSecurityConfiguration.DisplayName=Configurer la s\u00e9curit\u00e9 globale +GlobalSecurityConfiguration.Description=S\u00e9curiser Jenkins; d\u00e9finir qui est autoris\u00e9 \u00e0 acc\u00e9der au syst\u00e8me. LegacyAuthorizationStrategy.DisplayName=Mode legacy -HudsonPrivateSecurityRealm.DisplayName=Base de donnes des utilisateurs de Jenkins +HudsonPrivateSecurityRealm.DisplayName=Base de donn\u00e9es des utilisateurs de Jenkins HudsonPrivateSecurityRealm.Details.DisplayName=Mot de passe HudsonPrivateSecurityRealm.Details.PasswordError=\ - Le mot de passe de confirmation n''est pas le mme que le premier mot de passe. \ - Merci de vous assurer que les mots de passe sont les mmes dans les deux cases. -HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Grer les utilisateurs -HudsonPrivateSecurityRealm.ManageUserLinks.Description=Crer/supprimer/modifier les utilisateurs qui peuvent se logger sur ce serveur Jenkins + Le mot de passe de confirmation n''est pas le m\u00eame que le premier mot de passe. \ + Merci de vous assurer que les mots de passe sont les m\u00eames dans les deux cases. +HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=G\u00e9rer les utilisateurs +HudsonPrivateSecurityRealm.ManageUserLinks.Description=Cr\u00e9er/supprimer/modifier les utilisateurs qui peuvent se logger sur ce serveur Jenkins -FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Les utilisateurs connects peuvent tout faire +FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Les utilisateurs connect\u00e9s peuvent tout faire -AuthorizationStrategy.DisplayName=Tout le monde a accs toutes les fonctionnalits +AuthorizationStrategy.DisplayName=Tout le monde a acc\u00e8s \u00e0 toutes les fonctionnalit\u00e9s LDAPSecurityRealm.DisplayName=LDAP -LegacySecurityRealm.Displayname=Dlguer au conteneur de servlets +LegacySecurityRealm.Displayname=D\u00e9l\u00e9guer au conteneur de servlets -UserDetailsServiceProxy.UnableToQuery=Impossible de rcuprer les informations utilisateur: {0} +UserDetailsServiceProxy.UnableToQuery=Impossible de r\u00e9cup\u00e9rer les informations utilisateur: {0} -ProjectMatrixAuthorizationStrategy.DisplayName=Stratgie d''authorisation matricielle base sur les projets - -PAMSecurityRealm.DisplayName=Base de donnes des utilisateurs & des groupes Unix +PAMSecurityRealm.DisplayName=Base de donn\u00e9es des utilisateurs & des groupes Unix # not in use Permission.Permissions.Title=N/A diff --git a/core/src/main/resources/hudson/security/Messages_ja.properties b/core/src/main/resources/hudson/security/Messages_ja.properties index abe483a0c1..8107aa2dac 100644 --- a/core/src/main/resources/hudson/security/Messages_ja.properties +++ b/core/src/main/resources/hudson/security/Messages_ja.properties @@ -21,7 +21,6 @@ # THE SOFTWARE. GlobalSecurityConfiguration.DisplayName=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u8a2d\u5b9a GlobalSecurityConfiguration.Description=Jenkins\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u3002\u8ab0\u304c\u30b7\u30b9\u30c6\u30e0\u306b\u30a2\u30af\u30bb\u30b9\u3001\u4f7f\u7528\u3067\u304d\u308b\u304b\u306a\u3069\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u3002 -GlobalMatrixAuthorizationStrategy.DisplayName=\u884c\u5217\u306b\u3088\u308b\u6a29\u9650\u8a2d\u5b9a HudsonPrivateSecurityRealm.WouldYouLikeToSignUp=\u3053\u306e{0}\u306e{1}\u306f\u3001Jenkins\u306b\u306f\u767b\u9332\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7\u3057\u307e\u3059\u304b? LegacyAuthorizationStrategy.DisplayName=\u4e92\u63db\u6027\u30e2\u30fc\u30c9 @@ -53,8 +52,6 @@ LegacySecurityRealm.Displayname=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30b3\u30f3 UserDetailsServiceProxy.UnableToQuery={0}\u306e\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u3092\u691c\u7d22\u3067\u304d\u307e\u305b\u3093\u3002 -ProjectMatrixAuthorizationStrategy.DisplayName=\u884c\u5217\u306b\u3088\u308b\u6a29\u9650\u8a2d\u5b9a(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5358\u4f4d) - PAMSecurityRealm.DisplayName=Unix \u30e6\u30fc\u30b6\u30fc/\u30b0\u30eb\u30fc\u30d7 \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 PAMSecurityRealm.ReadPermission=Jenkins\u304c/etc/shadow\u3092\u8aad\u307f\u8fbc\u307f\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 PAMSecurityRealm.BelongToGroup=/etc/shadow\u3092\u8aad\u3081\u308b\u3088\u3046\u306b\u3001{0} \u304c\u30b0\u30eb\u30fc\u30d7 {1} \u306b\u5c5e\u3057\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 diff --git a/core/src/main/resources/hudson/security/Messages_nl.properties b/core/src/main/resources/hudson/security/Messages_nl.properties index aa1c62b8d0..14a9af3ec4 100644 --- a/core/src/main/resources/hudson/security/Messages_nl.properties +++ b/core/src/main/resources/hudson/security/Messages_nl.properties @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalMatrixAuthorizationStrategy.DisplayName=Matrix-gebaseerde beveiliging - LegacyAuthorizationStrategy.DisplayName=Legacy-mode HudsonPrivateSecurityRealm.Details.DisplayName=Paswoord diff --git a/core/src/main/resources/hudson/security/Messages_pt_BR.properties b/core/src/main/resources/hudson/security/Messages_pt_BR.properties index 1bda8e932b..272fcb7529 100644 --- a/core/src/main/resources/hudson/security/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/security/Messages_pt_BR.properties @@ -20,14 +20,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalMatrixAuthorizationStrategy.DisplayName=Seguran\u00E7a baseada em matriz - LegacyAuthorizationStrategy.DisplayName=Modo legado HudsonPrivateSecurityRealm.Details.DisplayName=Senha -HudsonPrivateSecurityRealm.Details.PasswordError=A senha confirmada n\u00E3o \u00E9 igual a senha informada. Por favor assegure-se de digitar a mesma senha duas vezes. +HudsonPrivateSecurityRealm.Details.PasswordError=A senha confirmada n\u00e3o \u00e9 igual a senha informada. Por favor assegure-se de digitar a mesma senha duas vezes. -UserDetailsServiceProxy.UnableToQuery=N\u00E3o foi poss\u00EDvel buscar informa\u00E7\u00F5es do usu\u00E1rio\: {0} +UserDetailsServiceProxy.UnableToQuery=N\u00e3o foi poss\u00edvel buscar informa\u00e7\u00f5es do usu\u00e1rio\: {0} # not in use Permission.Permissions.Title=N/A @@ -36,32 +34,30 @@ PAMSecurityRealm.Success=Sucesso # Unable to connect to {0} : {1} LDAPSecurityRealm.UnableToConnect=Incapaz de conectar {0} : {1} # Logged-in users can do anything -FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Usu\u00E1rios logados n\u00E3o conseguem fazer nada +FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Usu\u00e1rios logados n\u00e3o conseguem fazer nada # Unix user/group database -PAMSecurityRealm.DisplayName=Usu\u00E1rio Uniz / grupo banco da dados +PAMSecurityRealm.DisplayName=Usu\u00e1rio Uniz / grupo banco da dados # User ''{0}'' -PAMSecurityRealm.User=Usu\u00E1rio ''{0}'' +PAMSecurityRealm.User=Usu\u00e1rio ''{0}'' # {0} needs to belong to group {1} to read /etc/shadow PAMSecurityRealm.BelongToGroup= {0} precisa pertencer ao grupo {1} para ler /etc/shadow # Anyone can do anything AuthorizationStrategy.DisplayName=Ninguem consegue fazer nada -# Project-based Matrix Authorization Strategy -#ProjectMatrixAuthorizationStrategy.DisplayName= # Invalid port number -LDAPSecurityRealm.InvalidPortNumber=N\u00FAmero de porta inv\u00E1lido +LDAPSecurityRealm.InvalidPortNumber=N\u00famero de porta inv\u00e1lido # Unknown host: {0} -LDAPSecurityRealm.UnknownHost=Host n\u00E3o localizado {0} +LDAPSecurityRealm.UnknownHost=Host n\u00e3o localizado {0} # uid: {0} PAMSecurityRealm.Uid=uid: {0} # \ # Either Jenkins needs to run as {0} or {1} needs to belong to group {2} and ''chmod g+r /etc/shadow'' needs to be done to enable Jenkins to read /etc/shadow PAMSecurityRealm.RunAsUserOrBelongToGroupAndChmod=Jenkins precisa pertencer ao grupo {2} e ter acesso ''chmod g+r /etc/shadow'' para ler a pasta. # Current User -PAMSecurityRealm.CurrentUser=Usu\u00E1rio atual +PAMSecurityRealm.CurrentUser=Usu\u00e1rio atual # {0} is missing the {1} permission -AccessDeniedException2.MissingPermission= {0} est\u00E1 faltando a permiss\u00E3o {1} +AccessDeniedException2.MissingPermission= {0} est\u00e1 faltando a permiss\u00e3o {1} # Manage Users -HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Gerenciar usu\u00E1rios +HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Gerenciar usu\u00e1rios # Delegate to servlet container LegacySecurityRealm.Displayname=Delegar para o container servlet # LDAP @@ -71,6 +67,6 @@ HudsonPrivateSecurityRealm.DisplayName=Base de dados interna do Jenkins # Jenkins needs to be able to read /etc/shadow PAMSecurityRealm.ReadPermission=Jenkins precisa de acesso de leitura em /etc/shadow # Create/delete/modify users that can log in to this Jenkins -HudsonPrivateSecurityRealm.ManageUserLinks.Description=Criar/deletar/modificar usu\u00E1rios que logan no Jenkins +HudsonPrivateSecurityRealm.ManageUserLinks.Description=Criar/deletar/modificar usu\u00e1rios que logan no Jenkins # Syntax of server field is SERVER or SERVER:PORT or ldaps://SERVER[:PORT] LDAPSecurityRealm.SyntaxOfServerField=Sintaxe SERVER or SERVER:PORT or ldaps://SERVER[:PORT] diff --git a/core/src/main/resources/hudson/security/Messages_ru.properties b/core/src/main/resources/hudson/security/Messages_ru.properties index 10e9d57b24..2f9b4ecc14 100644 --- a/core/src/main/resources/hudson/security/Messages_ru.properties +++ b/core/src/main/resources/hudson/security/Messages_ru.properties @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalMatrixAuthorizationStrategy.DisplayName=\u041c\u0430\u0442\u0440\u0438\u0447\u043d\u043e\u0435 \u0440\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0435 \u043f\u0440\u0430\u0432 - LegacyAuthorizationStrategy.DisplayName="\u0422\u0440\u0430\u0434\u0438\u0446\u0438\u043e\u043d\u043d\u044b\u0439" \u0440\u0435\u0436\u0438\u043c HudsonPrivateSecurityRealm.Details.DisplayName=\u041f\u0430\u0440\u043e\u043b\u044c diff --git a/core/src/main/resources/hudson/security/Messages_tr.properties b/core/src/main/resources/hudson/security/Messages_tr.properties index f212942b83..062ca3e822 100644 --- a/core/src/main/resources/hudson/security/Messages_tr.properties +++ b/core/src/main/resources/hudson/security/Messages_tr.properties @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalMatrixAuthorizationStrategy.DisplayName=Matris-temelli G\u00fcvenlik - LegacyAuthorizationStrategy.DisplayName=Miras modu HudsonPrivateSecurityRealm.Details.DisplayName=\u015fifre diff --git a/core/src/main/resources/hudson/security/Messages_zh_CN.properties b/core/src/main/resources/hudson/security/Messages_zh_CN.properties index b18472c110..a69de52c6a 100644 --- a/core/src/main/resources/hudson/security/Messages_zh_CN.properties +++ b/core/src/main/resources/hudson/security/Messages_zh_CN.properties @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalMatrixAuthorizationStrategy.DisplayName=\u5b89\u5168\u77e9\u9635 - LegacyAuthorizationStrategy.DisplayName=\u9057\u7559\u6a21\u5f0f HudsonPrivateSecurityRealm.DisplayName=Jenkins\u4e13\u6709\u7528\u6237\u6570\u636e\u5e93 @@ -46,8 +44,6 @@ LegacySecurityRealm.Displayname=Servlet\u5bb9\u5668\u4ee3\u7406 UserDetailsServiceProxy.UnableToQuery=\u6ca1\u6709\u68c0\u7d22\u5230\u8fd9\u4e2a\u7528\u6237\u4fe1\u606f: {0} -ProjectMatrixAuthorizationStrategy.DisplayName=\u9879\u76ee\u77e9\u9635\u6388\u6743\u7b56\u7565 - PAMSecurityRealm.DisplayName=Unix\u7528\u6237/\u7ec4\u6570\u636e\u5e93 PAMSecurityRealm.ReadPermission=Jenkins\u9700\u8981\u6709/etc/shadow\u8bfb\u7684\u6743\u9650 PAMSecurityRealm.BelongToGroup={0}\u5fc5\u987b\u5c5e\u4e8e{1}\u7ec4\u6765\u8bfb\u53d6/etc/shadow diff --git a/core/src/main/resources/hudson/security/Messages_zh_TW.properties b/core/src/main/resources/hudson/security/Messages_zh_TW.properties index de69665baa..70e9876247 100644 --- a/core/src/main/resources/hudson/security/Messages_zh_TW.properties +++ b/core/src/main/resources/hudson/security/Messages_zh_TW.properties @@ -23,8 +23,6 @@ GlobalSecurityConfiguration.DisplayName=\u8a2d\u5b9a\u5168\u57df\u5b89\u5168\u6027 GlobalSecurityConfiguration.Description=\u4fdd\u8b77 Jenkins\uff0c\u5b9a\u7fa9\u8ab0\u53ef\u4ee5\u5b58\u53d6\u6216\u662f\u4f7f\u7528\u7cfb\u7d71\u3002 -GlobalMatrixAuthorizationStrategy.DisplayName=\u77e9\u9663\u578b\u5b89\u5168\u6027 - HudsonPrivateSecurityRealm.WouldYouLikeToSignUp=Jenkins \u4e0d\u8a8d\u5f97 {0} {1}\u3002\u60a8\u8981\u8a3b\u518a\u55ce? LegacyAuthorizationStrategy.DisplayName=\u820a\u7248\u6a21\u5f0f @@ -57,8 +55,6 @@ LegacySecurityRealm.Displayname=\u59d4\u6d3e\u7d66 Servlet Container UserDetailsServiceProxy.UnableToQuery=\u7121\u6cd5\u67e5\u8a62\u4f7f\u7528\u8005\u8cc7\u8a0a: {0} -ProjectMatrixAuthorizationStrategy.DisplayName=\u5c08\u6848\u578b\u77e9\u9663\u6388\u6b0a\u7b56\u7565 - PAMSecurityRealm.DisplayName=Unix \u4f7f\u7528\u8005\u3001\u7fa4\u7d44\u8cc7\u6599\u5eab PAMSecurityRealm.ReadPermission=Jenkins \u8981\u80fd\u8b80\u53d6 /etc/shadow PAMSecurityRealm.BelongToGroup={0} \u8981\u5728 {1} \u7fa4\u7d44\u88e1\uff0c\u4ee5\u4fbf\u8b80\u53d6 /etc/shadow diff --git a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help.html b/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help.html deleted file mode 100644 index 0d2bdeb80d..0000000000 --- a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help.html +++ /dev/null @@ -1,11 +0,0 @@ -
- This mode is an extension to "Matrix-based security" that allows additional ACL matrix to be defined - for each project separately (which is done on the job configuration screen.) - -

- This allows you to say things like "Joe can access project A, B, and C but he can't see D." - See the help of "Matrix-based security" for the concept of matrix-based security in general. - -

- ACLs are additive, so the access rights granted below will be effective for all the projects. -

diff --git a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_de.html b/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_de.html deleted file mode 100644 index ced065c3bc..0000000000 --- a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_de.html +++ /dev/null @@ -1,13 +0,0 @@ -
- Dieser Modus erweitert die "Matrix-basierte Sicherheit" um eine zusätzliche ACL-Rechtematrix, - die für jedes Projekt individuell festgelegt werden kann (in der Konfigurationsmaske des jeweiligen Jobs). - -

- Dies erlaubt Ihnen eine Rechtevergabe wie z.B. "Joe darf auf Projekt A, B und C zugreifen - er - soll aber Projekt D nicht sehen dürfen". Lesen Sie den Hilfetext bei "Matrix-basierte Sicherheit", - um mehr über das Konzept der matrix-basierten Sicherheit im Allgemeinen zu erfahren. - -

- ACL-Rechte sind additiv. Dies bedeutet, dass die untenstehend erteilten Rechte für alle - Projekte als erteilt gelten. -

diff --git a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_ja.html b/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_ja.html deleted file mode 100644 index 771a8be542..0000000000 --- a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_ja.html +++ /dev/null @@ -1,10 +0,0 @@ -
- "行列による権限設定"の拡張し、プロジェクト毎に行列による権限設定することができます(ジョブの設定画面で行います)。 - -

- 例えば、"JoeはプロジェクトA、B、Cにアクセスできるが、Dは参照できない"といったことができます。 - 行列による権限設定のコンセプトについては、"行列による権限設定"のヘルプを参照してください。 - -

- ここで設定した権限は、すべてのプロジェクトの権限に追加されます。 -

diff --git a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_CN.html b/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_CN.html deleted file mode 100644 index 5cdd5cdd10..0000000000 --- a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_CN.html +++ /dev/null @@ -1,9 +0,0 @@ -
- 这个授权模型扩展自"安全矩阵",允许把下面的ACL(访问控制列表)矩阵附加到每个项目定义中(在Job配置页面). - -

- 这允许你宣布类似这样的声明"约翰能够访问A,B和C,但是不能访问D." 查看"安全矩阵"的帮助文档来了解安全矩阵. - -

- ACL配置是追加的,就是说下面的访问控制会追加到所有的项目配置中。 -

diff --git a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_TW.html b/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_TW.html deleted file mode 100644 index 59856a2d21..0000000000 --- a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_TW.html +++ /dev/null @@ -1,11 +0,0 @@ -
- 這是「矩陣型安全性」的擴充，可以分別對專案定義額外的存取控制清單 (ACL) 矩陣 - (在作業設定畫面裡調整)。 - -

- 讓您能做到「Joe 可以看到 A, B, C 專案，但是看不到 D」這種程度的設定。 - 可以看看「矩陣型安全性」的說明，了解矩陣型安全性的基本概念。 - -

- ACL 會逐一累加，所以下列授與的存取權限會影響到每一個專案。 -

diff --git a/test/pom.xml b/test/pom.xml index 790ad4ae6a..53b5eaf1b1 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -81,6 +81,11 @@ THE SOFTWARE. mailer 1.5 + + org.jenkins-ci.plugins + matrix-auth + 1.0 + org.mortbay.jetty jetty diff --git a/war/pom.xml b/war/pom.xml index bd7c269983..1b3d4b30ea 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -338,6 +338,12 @@ THE SOFTWARE. 1.5 hpi + + org.jenkins-ci.plugins + matrix-auth + 1.0 + hpi + ${project.build.directory}/${project.build.finalName}/WEB-INF/plugins true -- GitLab From 89149277ae2bba5af702ba01cbb70bd3965b2859 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 4 Oct 2013 17:06:28 -0400 Subject: [PATCH 0096/1630] matrix-auth 1.0.2 (couple of fixups) --- .../java/hudson/ClassicPluginStrategy.java | 2 +- .../main/resources/hudson/security/table.css | 60 ------------------- test/pom.xml | 2 +- war/pom.xml | 2 +- 4 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 core/src/main/resources/hudson/security/table.css diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index 578fe58ef2..db9ed76603 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -273,7 +273,7 @@ public class ClassicPluginStrategy implements PluginStrategy { new DetachedPlugin("ldap","1.467.*","1.0"), new DetachedPlugin("pam-auth","1.467.*","1.0"), new DetachedPlugin("mailer","1.493.*","1.2"), - new DetachedPlugin("matrix-auth","1.535.*","1.0") + new DetachedPlugin("matrix-auth","1.535.*","1.0.2") ); /** diff --git a/core/src/main/resources/hudson/security/table.css b/core/src/main/resources/hudson/security/table.css deleted file mode 100644 index 3a83f937e4..0000000000 --- a/core/src/main/resources/hudson/security/table.css +++ /dev/null @@ -1,60 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -.global-matrix-authorization-strategy-table { - border-collapse: collapse; - border-spacing: 0; - border: 1px solid #D3D7CF; -} - -.global-matrix-authorization-strategy-table TH { - padding: 0.2em; -} - -.global-matrix-authorization-strategy-table TD.blank { - vertical-align: middle; - padding: 0.2em; -} - -.global-matrix-authorization-strategy-table .caption-row TH { - font-weight: lighter; - writing-mode: tb-rl; /* works in IE, not FF */ - padding: 0; -} - -.global-matrix-authorization-strategy-table TD { - border: 1px solid #D3D7CF; -} - -.global-matrix-authorization-strategy-table TD.left-most { - text-align: left; - border-left: none; - white-space: nowrap; -} - -.global-matrix-authorization-strategy-table TD.stop { - border-top: 1px solid white; - border-right: 1px solid white; - border-bottom: 1px solid white; - white-space: nowrap; -} diff --git a/test/pom.xml b/test/pom.xml index 53b5eaf1b1..53873cc2b1 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -84,7 +84,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-auth - 1.0 + 1.0.2 org.mortbay.jetty diff --git a/war/pom.xml b/war/pom.xml index 1b3d4b30ea..1c278dee71 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -341,7 +341,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-auth - 1.0 + 1.0.2 hpi -- GitLab From 4613b15cc431df19e73b21caff63b3bbe262a761 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 4 Oct 2013 17:32:19 -0400 Subject: [PATCH 0097/1630] Split out ui-samples-plugin into its own repo. --- .idea/compiler.xml | 4 - .idea/encodings.xml | 1 - .idea/groovyc.xml | 1 - changelog.html | 2 + pom.xml | 1 - ui-samples-plugin/pom.xml | 119 -------------- .../ui_samples/AutoCompleteTextBox.java | 113 ------------- .../plugins/ui_samples/CopyButton.java | 29 ---- .../plugins/ui_samples/DropdownList.java | 93 ----------- .../plugins/ui_samples/DynamicComboBox.java | 64 -------- .../ui_samples/DynamicDropDownListBox.java | 54 ------- .../FormFieldValidationWithContext.java | 127 --------------- .../plugins/ui_samples/HeteroList.java | 150 ------------------ .../InpageNavigationWithBreadcrumb.java | 30 ---- .../plugins/ui_samples/JavaScriptProxy.java | 32 ---- .../ui_samples/ModularizeViewScript.java | 28 ---- .../ui_samples/NavigationContextMenu.java | 50 ------ .../plugins/ui_samples/NotificationBar.java | 29 ---- .../plugins/ui_samples/ProgressBar.java | 29 ---- .../ui_samples/ProgressivelyRendered.java | 77 --------- .../java/jenkins/plugins/ui_samples/Root.java | 52 ------ .../ui_samples/SyntaxHighlightedTextArea.java | 29 ---- .../jenkins/plugins/ui_samples/UISample.java | 135 ---------------- .../ui_samples/UISampleDescriptor.java | 13 -- .../src/main/resources/index.jelly | 3 - .../AutoCompleteTextBox/index.jelly | 36 ----- .../ui_samples/CopyButton/index.groovy | 20 --- .../ui_samples/CopyButton/index.properties | 11 -- .../DropdownList/Apple/config.jelly | 29 ---- .../DropdownList/Banana/config.jelly | 29 ---- .../ui_samples/DropdownList/index.jelly | 50 ------ .../ui_samples/DynamicComboBox/index.jelly | 38 ----- .../DynamicDropDownListBox/index.jelly | 41 ----- .../City/config.groovy | 7 - .../State/config.groovy | 19 --- .../index.groovy | 22 --- .../index.properties | 9 -- .../HeteroList/ChoiceEntry/config.jelly | 32 ---- .../ui_samples/HeteroList/Config/config.jelly | 33 ---- .../HeteroList/SimpleEntry/config.jelly | 31 ---- .../ui_samples/HeteroList/configure.jelly | 42 ----- .../plugins/ui_samples/HeteroList/index.jelly | 41 ----- .../header.groovy | 6 - .../index.groovy | 21 --- .../index.properties | 5 - .../ui_samples/JavaScriptProxy/index.jelly | 45 ------ .../ModularizeViewScript/index.groovy | 43 ----- .../NavigationContextMenu/index.groovy | 48 ------ .../NavigationContextMenu/index.properties | 27 ---- .../ui_samples/NotificationBar/index.groovy | 22 --- .../NotificationBar/index.properties | 6 - .../ui_samples/ProgressBar/index.groovy | 30 ---- .../ProgressivelyRendered/index.jelly | 50 ------ .../plugins/ui_samples/Root/index.jelly | 60 ------- .../SyntaxHighlightedTextArea/index.groovy | 33 ---- .../main/resources/lib/samples/sample.jelly | 51 ------ .../src/main/resources/lib/samples/taglib | 0 war/pom.xml | 2 - 58 files changed, 2 insertions(+), 2202 deletions(-) delete mode 100644 ui-samples-plugin/pom.xml delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/AutoCompleteTextBox.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/CopyButton.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DropdownList.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicComboBox.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicDropDownListBox.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/FormFieldValidationWithContext.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/HeteroList.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/JavaScriptProxy.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ModularizeViewScript.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NavigationContextMenu.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NotificationBar.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressBar.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressivelyRendered.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/Root.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISample.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISampleDescriptor.java delete mode 100644 ui-samples-plugin/src/main/resources/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/AutoCompleteTextBox/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.properties delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Apple/config.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Banana/config.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicComboBox/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicDropDownListBox/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/City/config.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/State/config.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.properties delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/ChoiceEntry/config.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/Config/config.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/SimpleEntry/config.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/configure.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/header.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.properties delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/JavaScriptProxy/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ModularizeViewScript/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.properties delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.properties delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressBar/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressivelyRendered/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/Root/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/lib/samples/sample.jelly delete mode 100644 ui-samples-plugin/src/main/resources/lib/samples/taglib diff --git a/.idea/compiler.xml b/.idea/compiler.xml index cd8f01b071..7c9af026e3 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -5,8 +5,6 @@ - - @@ -42,7 +40,6 @@ - @@ -53,7 +50,6 @@ - diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 8b72c68c7d..bb7dc2c6f1 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -7,7 +7,6 @@ - diff --git a/.idea/groovyc.xml b/.idea/groovyc.xml index c24d9163c1..117b3f5aa7 100644 --- a/.idea/groovyc.xml +++ b/.idea/groovyc.xml @@ -4,7 +4,6 @@ - diff --git a/changelog.html b/changelog.html index 7ef98c0787..a07bb6c40c 100644 --- a/changelog.html +++ b/changelog.html @@ -63,6 +63,8 @@ Upcoming changes (issue 8957)
  • Split matrix authorization strategies into an independent plugin. +
  • + UI Samples plugin fully separated from core. To view samples during plugin development or at any other time, just install from the update center.
  • SCM polling sometimes broken since 1.527 due to a change in how environment variables are calculated. (issue 19307) diff --git a/pom.xml b/pom.xml index 222b5e53ba..7cff659191 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,6 @@ THE SOFTWARE. core - ui-samples-plugin war test cli diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml deleted file mode 100644 index 75cadd59e3..0000000000 --- a/ui-samples-plugin/pom.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - 4.0.0 - - - org.jenkins-ci.main - pom - 1.535-SNAPSHOT - - - ui-samples-plugin - hpi - - Jenkins UI sample plugin - - - - org.jenkins-ci.main - jenkins-core - ${project.version} - provided - - - - org.jenkins-ci.main - jenkins-test-harness - ${project.version} - test - - - org.jenkins-ci.main - jenkins-war - war - ${project.version} - test - - - javax.servlet - servlet-api - 2.4 - provided - - - - - - ${project.artifactId} - package - - - src/main/resources - - - src/main/java - - - - - org.jenkins-ci.tools - maven-hpi-plugin - - true - - true - - - - org.kohsuke.stapler - maven-stapler-plugin - - true - - - org.jvnet.localizer - maven-localizer-plugin - - - - - generate - - - Messages.properties - target/generated-sources/localizer - - - - - - - - diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/AutoCompleteTextBox.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/AutoCompleteTextBox.java deleted file mode 100644 index 9a5e1afa99..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/AutoCompleteTextBox.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2010, InfraDNA, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import hudson.model.AutoCompletionCandidates; -import org.kohsuke.stapler.QueryParameter; - -/** - * Adding auto-completion to the text box. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class AutoCompleteTextBox extends UISample { - @Override - public String getDescription() { - return "Provide auto-completion to the text box"; - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - /** - * This method provides auto-completion items for the 'state' field. - * Stapler finds this method via the naming convention. - * - * @param value - * The text that the user entered. - */ - public AutoCompletionCandidates doAutoCompleteState(@QueryParameter String value) { - AutoCompletionCandidates c = new AutoCompletionCandidates(); - for (String state : STATES) - if (state.toLowerCase().startsWith(value.toLowerCase())) - c.add(state); - return c; - } - } - - private static final String[] STATES = new String[]{ - "Alabama", - "Alaska", - "Arizona", - "Arkansas", - "California", - "Colorado", - "Connecticut", - "Delaware", - "Florida", - "Georgia", - "Hawaii", - "Idaho", - "Illinois", - "Indiana", - "Iowa", - "Kansas", - "Kentucky", - "Louisiana", - "Maine", - "Maryland", - "Massachusetts", - "Michigan", - "Minnesota", - "Mississippi", - "Missouri", - "Montana", - "Nebraska", - "Nevada", - "New Hampshire", - "New Jersey", - "New Mexico", - "New York", - "North Carolina", - "North Dakota", - "Ohio", - "Oklahoma", - "Oregon", - "Pennsylvania", - "Rhode Island", - "South Carolina", - "South Dakota", - "Tennessee", - "Texas", - "Utah", - "Vermont", - "Virginia", - "Washington", - "West Virginia", - "Wisconsin", - "Wyoming" - }; -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/CopyButton.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/CopyButton.java deleted file mode 100644 index 6a0075ed0a..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/CopyButton.java +++ /dev/null @@ -1,29 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; - -import java.util.Arrays; -import java.util.List; - -/** - * @author Kohsuke Kawaguchi - */ -@Extension -public class CopyButton extends UISample { - @Override - public String getDescription() { - return "A small button to copy text into a clipboard"; - } - - public List getSourceFiles() { - // TODO: generate this from index - return Arrays.asList( - new SourceFile("index.groovy")); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} - - diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DropdownList.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DropdownList.java deleted file mode 100644 index 8dcb85c95f..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DropdownList.java +++ /dev/null @@ -1,93 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.DescriptorExtensionList; -import hudson.Extension; -import hudson.ExtensionPoint; -import hudson.model.Describable; -import hudson.model.Descriptor; -import jenkins.model.Jenkins; -import hudson.util.XStream2; -import java.io.IOException; -import java.util.List; -import javax.servlet.ServletException; - -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -/** - * @author Alan.Harder@oracle.com - */ -@Extension -public class DropdownList extends UISample { - - @Override - public String getDescription() { - return "Show different form elements based on choice in a <select> control"; - } - - public Fruit getFruit() { - // Could return currently configured/saved item here to initialized form with this data - return null; - } - - public DescriptorExtensionList> getFruitDescriptors() { - return Jenkins.getInstance().>getDescriptorList(Fruit.class); - } - - // Process form data and show it as serialized XML - public void doSubmit(StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException { - // stapler-class in form data tells Stapler which Fruit subclass to use - Fruit fruit = req.bindJSON(Fruit.class, req.getSubmittedForm().getJSONObject("fruit")); - rsp.setContentType("text/plain"); - new XStream2().toXML(fruit, rsp.getWriter()); - } - - @Override - public List getSourceFiles() { - List list = new java.util.ArrayList(super.getSourceFiles()); - list.add(new SourceFile("Apple/config.jelly")); - list.add(new SourceFile("Banana/config.jelly")); - return list; - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } - - public static abstract class Fruit implements ExtensionPoint, Describable { - protected String name; - protected Fruit(String name) { this.name = name; } - - public Descriptor getDescriptor() { - return Jenkins.getInstance().getDescriptor(getClass()); - } - } - - public static class FruitDescriptor extends Descriptor { - public FruitDescriptor(Class clazz) { - super(clazz); - } - public String getDisplayName() { - return clazz.getSimpleName(); - } - } - - public static class Apple extends Fruit { - private int seeds; - @DataBoundConstructor public Apple(int seeds) { - super("Apple"); - this.seeds = seeds; - } - @Extension public static final FruitDescriptor D = new FruitDescriptor(Apple.class); - } - - public static class Banana extends Fruit { - private boolean yellow; - @DataBoundConstructor public Banana(boolean yellow) { - super("Banana"); - this.yellow = yellow; - } - @Extension public static final FruitDescriptor D = new FruitDescriptor(Banana.class); - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicComboBox.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicComboBox.java deleted file mode 100644 index edb72122d7..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicComboBox.java +++ /dev/null @@ -1,64 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import hudson.util.ComboBoxModel; -import hudson.util.ListBoxModel; -import org.kohsuke.stapler.QueryParameter; - -/** - * Combo box that changes the contents based on the values of other controls. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class DynamicComboBox extends UISample { - - @Override - public String getDescription() { - return "Updates the contents of a combo box control dynamically based on selections of other controls"; - } - - // these getter methods should return the current value, which form the initial selection. - - public String getAlbum() { - return "3"; - } - - public String getTitle() { - return "Rocker"; - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - /** - * This method determines the values of the album drop-down list box. - */ - public ListBoxModel doFillAlbumItems() { - ListBoxModel m = new ListBoxModel(); - m.add("Yellow Submarine","1"); - m.add("Abbey Road","2"); - m.add("Let It Be","3"); - return m; - } - - /** - * This method determines the values of the song title combo box. - * Note that it takes the album information as a parameter, so the contents - * of the combo box changes depending on the currently selected album. - */ - public ComboBoxModel doFillTitleItems(@QueryParameter int album) { - switch (album) { - case 1: - return new ComboBoxModel("Yellow Submarine","Only a Northern Song","All You Need Is Love"); - case 2: - return new ComboBoxModel("Come Together","Something","I Want You"); - case 3: - return new ComboBoxModel("The One After 909","Rocker","Get Back"); - default: - // if no value is selected in the album, we'll get 0 - return new ComboBoxModel(); - } - } - - } -} \ No newline at end of file diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicDropDownListBox.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicDropDownListBox.java deleted file mode 100644 index 73823869d0..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicDropDownListBox.java +++ /dev/null @@ -1,54 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import hudson.util.ListBoxModel; -import org.kohsuke.stapler.QueryParameter; - -import static java.util.Arrays.asList; - -/** - * Example of a dynamic drop-down list box that changes the contents dynamically based on the values of other controls. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class DynamicDropDownListBox extends UISample { - - @Override - public String getDescription() { - return "Updates the contents of a <select> control dynamically based on selections of other controls"; - } - - // these getter methods should return the current value, which form the initial selection. - - public String getCountry() { - return "USA"; - } - - public String getState() { - return "USA:B"; - } - - public String getCity() { - return "USA:B:Z"; - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - public ListBoxModel doFillStateItems(@QueryParameter String country) { - ListBoxModel m = new ListBoxModel(); - for (String s : asList("A","B","C")) - m.add(String.format("State %s in %s", s, country), - country+':'+s); - return m; - } - - public ListBoxModel doFillCityItems(@QueryParameter String country, @QueryParameter String state) { - ListBoxModel m = new ListBoxModel(); - for (String s : asList("X","Y","Z")) - m.add(String.format("City %s in %s %s", s, state, country), - state+':'+s); - return m; - } - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/FormFieldValidationWithContext.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/FormFieldValidationWithContext.java deleted file mode 100644 index 68f6ec0690..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/FormFieldValidationWithContext.java +++ /dev/null @@ -1,127 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import hudson.RelativePath; -import hudson.model.AbstractDescribableImpl; -import hudson.model.Descriptor; -import hudson.util.FormValidation; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.QueryParameter; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * How to access values of the nearby input fields when you do form field validation. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class FormFieldValidationWithContext extends UISample { - private List states = new ArrayList(Arrays.asList( - new State("California",new City("Sacramento"), Arrays.asList(new City("San Francisco"),new City("Los Angeles"))), - new State("New York",new City("New York"), Arrays.asList(new City("Albany"),new City("Ithaca"))) - )); - - public FormFieldValidationWithContext() { - } - - @DataBoundConstructor - public FormFieldValidationWithContext(List states) { - this.states = states; - } - - @Override - public String getDescription() { - return "How to access values of the nearby input fields when you do form field validation"; - } - - public List getStates() { - return states; - } - - @Override - public List getSourceFiles() { - List r = super.getSourceFiles(); - r.add(new SourceFile("City/config.groovy")); - r.add(new SourceFile("State/config.groovy")); - return r; - } - - public static class State extends AbstractDescribableImpl { - /* - I'm lazy and just exposing fields as opposed to getter/setter. - Jenkins doesn't care and works correctly either way. - */ - public String name; - public City capital; - public List cities; - - @DataBoundConstructor - public State(String name, City capital, List cities) { - this.name = name; - this.capital = capital; - this.cities = cities; - } - - @Extension - public static class DescriptorImpl extends Descriptor { - @Override - public String getDisplayName() { - return ""; - } - - public FormValidation doCheckName(@QueryParameter String value, - @RelativePath("capital") @QueryParameter String name) { - /* - @RelativePath("capital") @QueryParameter - ... is short for - @RelativePath("capital") @QueryParameter("name") - ... and thus can be thought of "capital/name" - - so this matches the current city name entered as the capital of this state - */ - - return FormValidation.ok("Are you sure " + name + " is a capital of " + value + "?"); - } - } - } - - public static class City extends AbstractDescribableImpl { - public String name; - - @DataBoundConstructor - public City(String name) { - this.name = name; - } - - @Extension - public static class DescriptorImpl extends Descriptor { - @Override - public String getDisplayName() { - return ""; - } - - public FormValidation doCheckName(@QueryParameter String value, - @RelativePath("..") @QueryParameter String name) { - /* - @RelativePath("..") @QueryParameter - ... is short for - @RelativePath("..") @QueryParameter("name") - ... and thus can be thought of "../name" - - in the UI, fields for city is wrapped inside those of state, so "../name" binds - to the name field in the state. - */ - - if (name==null || value==null || value.contains(name)) return FormValidation.ok(); - return FormValidation.warning("City name doesn't contain "+name); - } - } - } - - @Extension - public static class DescriptorImpl extends UISampleDescriptor { - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/HeteroList.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/HeteroList.java deleted file mode 100644 index 6b832e8c62..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/HeteroList.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * The MIT License - * - * Copyright 2013 Jesse Glick. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import hudson.XmlFile; -import hudson.model.AbstractDescribableImpl; -import hudson.model.Descriptor; -import hudson.util.FormApply; -import hudson.util.ListBoxModel; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import javax.servlet.ServletException; -import jenkins.model.Jenkins; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.StaplerRequest; - -@Extension public final class HeteroList extends UISample { - - @Override public String getDescription() { - return "Show a heterogeneous list of subitems with different data bindings for radio buttons and checkboxes"; - } - - @Override public List getSourceFiles() { - return super.getSourceFiles(); - // TODO add others - } - - @Extension public static final class DescriptorImpl extends UISampleDescriptor {} - - public XmlFile getConfigFile() { - return new XmlFile(new File(Jenkins.getInstance().getRootDir(), "stuff.xml")); - } - - private Config config; - - public HeteroList() throws IOException { - XmlFile xml = getConfigFile(); - if (xml.exists()) { - xml.unmarshal(this); - } - } - - public Config getConfig() { - return config; - } - - public void setConfig(Config config) { - this.config = config; - } - - public HttpResponse doConfigSubmit(StaplerRequest req) throws ServletException, IOException { - config = null; // otherwise bindJSON will never clear it once set - req.bindJSON(this, req.getSubmittedForm()); - getConfigFile().write(this); - return FormApply.success("."); - } - - public static final class Config extends AbstractDescribableImpl { - - private final List entries; - - @DataBoundConstructor public Config(List entries) { - this.entries = entries != null ? new ArrayList(entries) : Collections.emptyList(); - } - - public List getEntries() { - return Collections.unmodifiableList(entries); - } - - @Extension public static class DescriptorImpl extends Descriptor { - @Override public String getDisplayName() {return "";} - } - - } - - public static abstract class Entry extends AbstractDescribableImpl {} - - public static final class SimpleEntry extends Entry { - - private final String text; - - @DataBoundConstructor public SimpleEntry(String text) { - this.text = text; - } - - public String getText() { - return text; - } - - @Extension public static class DescriptorImpl extends Descriptor { - @Override public String getDisplayName() { - return "Simple Entry"; - } - } - - } - - public static final class ChoiceEntry extends Entry { - - private final String choice; - - @DataBoundConstructor public ChoiceEntry(String choice) { - this.choice = choice; - } - - public String getChoice() { - return choice; - } - - @Extension public static class DescriptorImpl extends Descriptor { - - @Override public String getDisplayName() { - return "Choice Entry"; - } - - public ListBoxModel doFillChoiceItems() { - return new ListBoxModel().add("good").add("bad").add("ugly"); - } - - } - } - -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb.java deleted file mode 100644 index 1c20d7fe89..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb.java +++ /dev/null @@ -1,30 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; - -import java.util.Arrays; -import java.util.List; - -/** - * @author Kohsuke Kawaguchi - */ -@Extension -public class InpageNavigationWithBreadcrumb extends UISample { - @Override - public String getDescription() { - return "Adds in-page navigation with extra breadcrumb"; - } - - public List getSourceFiles() { - // TODO: generate this from index - return Arrays.asList( - new SourceFile("index.groovy"), - new SourceFile("header.groovy")); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} - - diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/JavaScriptProxy.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/JavaScriptProxy.java deleted file mode 100644 index 80afaa2649..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/JavaScriptProxy.java +++ /dev/null @@ -1,32 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import org.kohsuke.stapler.bind.JavaScriptMethod; - -/** - * "Export" Java objects to JavaScript in the browser as a proxy object, so that - * you can make ajax-calls to the server later. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class JavaScriptProxy extends UISample { - private int i; - - @Override - public String getDescription() { - return "Use JavaScript proxy objects to access server-side Java objects from inside the browser."; - } - - /** - * The annotation exposes this method to JavaScript proxy. - */ - @JavaScriptMethod - public int increment(int n) { - return i+=n; - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ModularizeViewScript.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ModularizeViewScript.java deleted file mode 100644 index 36eca31e3d..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ModularizeViewScript.java +++ /dev/null @@ -1,28 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; - -import java.util.Arrays; -import java.util.List; - -/** - * Define portions of view fragments in separate methods/classes to improve reuse. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class ModularizeViewScript extends UISample { - @Override - public String getDescription() { - return "Define portions of view fragments in separate methods/classes to improve reuse"; - } - - public List getSourceFiles() { - // TODO: generate this from index - return Arrays.asList(new SourceFile("index.groovy")); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NavigationContextMenu.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NavigationContextMenu.java deleted file mode 100644 index 6770a566ca..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NavigationContextMenu.java +++ /dev/null @@ -1,50 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import jenkins.model.ModelObjectWithChildren; -import jenkins.model.ModelObjectWithContextMenu; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -/** - * @author Kohsuke Kawaguchi - */ -@Extension -public class NavigationContextMenu extends UISample implements ModelObjectWithContextMenu, ModelObjectWithChildren { - @Override - public String getDescription() { - return "Integrate with navigational context menu to provider quick access around object graph"; - } - - /** - * This method is called via AJAX to obtain the context menu for this model object. - */ - public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws Exception { - if (false) { - // this implementation is suffice for most ModelObjects. It uses sidepanel.jelly/.groovy to - // generate the context menu - return new ContextMenu().from(this,request,response); - } else { - // otherwise you can also programatically create them. - // see the javadoc for various convenience methods to add items - return new ContextMenu() - .add("http://jenkins-ci.org/","Jenkins project") - .add("http://www.cloudbees.com/","CloudBees") - .add(new MenuItem().withContextRelativeUrl("/").withStockIcon("gear.png").withDisplayName("top page")); - } - } - - public ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception { - // You implement this method in much the same way you do doContextMenu - return new ContextMenu() - .add("http://yahoo.com/","Yahoo") - .add("http://google.com/","Google") - .add("http://microsoft.com/","Microsoft"); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} - - diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NotificationBar.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NotificationBar.java deleted file mode 100644 index cf81df117b..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NotificationBar.java +++ /dev/null @@ -1,29 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; - -import java.util.Arrays; -import java.util.List; - -/** - * @author Kohsuke Kawaguchi - */ -@Extension -public class NotificationBar extends UISample { - @Override - public String getDescription() { - return "Notification bar shows a transient message on the top of the page"; - } - - public List getSourceFiles() { - // TODO: generate this from index - return Arrays.asList( - new SourceFile("index.groovy")); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} - - diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressBar.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressBar.java deleted file mode 100644 index 49b7094e80..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressBar.java +++ /dev/null @@ -1,29 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; - -import java.util.Arrays; -import java.util.List; - -/** - * @author Kohsuke Kawaguchi - */ -@Extension -public class ProgressBar extends UISample { - @Override - public String getDescription() { - return "Shows you how to use the progress bar widget that's used in the executor view and other places"; - } - - public List getSourceFiles() { - // TODO: generate this from index - return Arrays.asList( - // new SourceFile(getClass().getSimpleName() + ".java"), // nothing interesting in the Java source file - new SourceFile("index.groovy")); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} - diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressivelyRendered.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressivelyRendered.java deleted file mode 100644 index e70729e5be..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressivelyRendered.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * The MIT License - * - * Copyright 2012 Jesse Glick. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import java.util.LinkedList; -import java.util.List; -import jenkins.util.ProgressiveRendering; -import net.sf.json.JSON; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -@Extension -public class ProgressivelyRendered extends UISample { - - @Override public String getDescription() { - return "Shows how to use progressively rendered content to avoid overloading the server with a slow HTTP request."; - } - - public ProgressiveRendering factor(final String numberS) { - return new ProgressiveRendering() { - final List newFactors = new LinkedList(); - @Override protected void compute() throws Exception { - int number = Integer.parseInt(numberS); // try entering a nonnumeric value! - // Deliberately inefficient: - for (int i = 1; i <= number; i++) { - if (canceled()) { - return; - } - if (i % 1000000 == 0) { - Thread.sleep(10); // take a breather - } - if (number % i == 0) { - synchronized (this) { - newFactors.add(i); - } - } - progress(((double) i) / number); - } - } - @Override protected synchronized JSON data() { - JSONArray r = new JSONArray(); - for (int i : newFactors) { - r.add(i); - } - newFactors.clear(); - return new JSONObject().accumulate("newfactors", r); - } - }; - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor {} - -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/Root.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/Root.java deleted file mode 100644 index f22e01f11c..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/Root.java +++ /dev/null @@ -1,52 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import hudson.model.RootAction; -import jenkins.model.ModelObjectWithContextMenu; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -import java.util.List; - -/** - * Entry point to all the UI samples. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class Root implements RootAction, ModelObjectWithContextMenu { - public String getIconFileName() { - return "gear.png"; - } - - public String getDisplayName() { - return "UI Samples"; - } - - public String getUrlName() { - return "ui-samples"; - } - - public UISample getDynamic(String name) { - for (UISample ui : getAll()) - if (ui.getUrlName().equals(name)) - return ui; - return null; - } - - public List getAll() { - return UISample.all(); - } - - public List getAllGroovy() { - return UISample.getGroovySamples(); - } - - public List getAllOther() { - return UISample.getOtherSamples(); - } - - public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws Exception { - return new ContextMenu().addAll(getAll()); - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea.java deleted file mode 100644 index 514d572404..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea.java +++ /dev/null @@ -1,29 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; - -import java.util.Arrays; -import java.util.List; - -/** - * Syntax-highlighted text area (powered by CodeMirror). - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class SyntaxHighlightedTextArea extends UISample { - @Override - public String getDescription() { - return "Syntax-highlighted text area powered by CodeMirror"; - } - - public List getSourceFiles() { - // TODO: generate this from index - return Arrays.asList(new SourceFile(getClass().getSimpleName() + ".java"), - new SourceFile("index.groovy")); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISample.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISample.java deleted file mode 100644 index 5ba7bae936..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISample.java +++ /dev/null @@ -1,135 +0,0 @@ -package jenkins.plugins.ui_samples; - -import static org.apache.commons.io.IOUtils.copy; -import hudson.ExtensionList; -import hudson.ExtensionPoint; -import hudson.model.Action; -import hudson.model.Describable; - -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import jenkins.model.Jenkins; - -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -/** - * @author Kohsuke Kawaguchi - */ -public abstract class UISample implements ExtensionPoint, Action, Describable { - public String getIconFileName() { - return "gear.png"; - } - - public String getUrlName() { - return getClass().getSimpleName(); - } - - /** - * Default display name. - */ - public String getDisplayName() { - return getClass().getSimpleName(); - } - - /** - * Source files associated with this sample. - */ - public List getSourceFiles() { - List r = new ArrayList(); - - r.add(new SourceFile(getClass().getSimpleName()+".java")); - for (String name : new String[]{"index.jelly","index.groovy"}) { - SourceFile s = new SourceFile(name); - if (s.resolve()!=null) - r.add(s); - } - return r; - } - - /** - * Binds {@link SourceFile}s into URL. - */ - public void doSourceFile(StaplerRequest req, StaplerResponse rsp) throws IOException { - String name = req.getRestOfPath().substring(1); // Remove leading / - for (SourceFile sf : getSourceFiles()) - if (sf.name.equals(name)) { - sf.doIndex(rsp); - return; - } - rsp.sendError(rsp.SC_NOT_FOUND); - } - - /** - * Returns a paragraph of natural text that describes this sample. - * Interpreted as HTML. - */ - public abstract String getDescription(); - - public UISampleDescriptor getDescriptor() { - return (UISampleDescriptor) Jenkins.getInstance().getDescriptorOrDie(getClass()); - } - - /** - * Returns all the registered {@link UISample}s. - */ - public static ExtensionList all() { - return Jenkins.getInstance().getExtensionList(UISample.class); - } - - public static List getGroovySamples() { - List r = new ArrayList(); - for (UISample uiSample : UISample.all()) { - for (SourceFile src : uiSample.getSourceFiles()) { - if (src.name.contains("groovy")) { - r.add(uiSample); - break; - } - } - } - return r; - } - - public static List getOtherSamples() { - List r = new ArrayList(); - OUTER: - for (UISample uiSample : UISample.all()) { - for (SourceFile src : uiSample.getSourceFiles()) { - if (src.name.contains("groovy")) { - continue OUTER; - } - } - r.add(uiSample); - } - return r; - } - - /** - * @author Kohsuke Kawaguchi - */ - public class SourceFile { - public final String name; - - public SourceFile(String name) { - this.name = name; - } - - public URL resolve() { - return UISample.this.getClass().getResource( - (name.endsWith(".jelly") || name.endsWith(".groovy")) ? UISample.this.getClass().getSimpleName()+"/"+name : name); - } - - /** - * Serves this source file. - */ - public void doIndex(StaplerResponse rsp) throws IOException { - rsp.setContentType("text/plain;charset=UTF-8"); - copy(resolve().openStream(),rsp.getOutputStream()); - } - } - -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISampleDescriptor.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISampleDescriptor.java deleted file mode 100644 index d339263125..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISampleDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.model.Descriptor; - -/** - * @author Kohsuke Kawaguchi - */ -public abstract class UISampleDescriptor extends Descriptor { - @Override - public String getDisplayName() { - return clazz.getSimpleName(); - } -} diff --git a/ui-samples-plugin/src/main/resources/index.jelly b/ui-samples-plugin/src/main/resources/index.jelly deleted file mode 100644 index 42497a610a..0000000000 --- a/ui-samples-plugin/src/main/resources/index.jelly +++ /dev/null @@ -1,3 +0,0 @@ -
    - Demonstration of UI controls available in Jenkins based on Stapler, Jelly, Groovy and etc. -
    diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/AutoCompleteTextBox/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/AutoCompleteTextBox/index.jelly deleted file mode 100644 index 45381e7a3a..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/AutoCompleteTextBox/index.jelly +++ /dev/null @@ -1,36 +0,0 @@ - - - - -
    - - - - -
    -
    -     -     - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.groovy deleted file mode 100644 index 7d3f5a4b63..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.groovy +++ /dev/null @@ -1,20 +0,0 @@ -package jenkins.plugins.ui_samples.CopyButton; - -import lib.JenkinsTagLib -import lib.LayoutTagLib - -def st=namespace("jelly:stapler") - -t=namespace(JenkinsTagLib.class) -l=namespace(LayoutTagLib.class) - -namespace("/lib/samples").sample(title:_("Copy Button")) { - raw(_("blurb")) - - div(style:"margin:2em") { - text("Copy this text! ") - l.copyButton(message:"text copied",text:"here comes ABC",container:"DIV") - } - - raw(_("aboutContainerElement")) -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.properties b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.properties deleted file mode 100644 index a3c52f5643..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.properties +++ /dev/null @@ -1,11 +0,0 @@ -blurb=\ - l.copyButton tag creates a small button that allows users to paste text into the clipboard. \ - Browsers make it unbelievably hard to do this simple task, so that's why we use a tag to encapsulate it. \ - The tag requires two mandatory attributes. One is text, which represents the text to be copied into the clipboard. \ - The other is message, which represents a message to be displayed upon the successful copying into the clipboard. - -aboutContainerElement=\ - According to ZeroClipboard documentation, \ - which is what we use for the copying, it is desirable to have an outer block element that houses a button, to improve \ - the accuracy of positioning a hidden flash movie. This can be specified as a CSS selector in the container attribute. \ - Note that you do not need to set the position:relative manually, as this tag will automatically set it. \ No newline at end of file diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Apple/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Apple/config.jelly deleted file mode 100644 index 932613bd80..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Apple/config.jelly +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Banana/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Banana/config.jelly deleted file mode 100644 index 8079626f8c..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Banana/config.jelly +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/index.jelly deleted file mode 100644 index c2f6b05a75..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/index.jelly +++ /dev/null @@ -1,50 +0,0 @@ - - - - -
    - - - - - - - - - - - - - - - - - - -
    -
    -     -     diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicComboBox/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicComboBox/index.jelly deleted file mode 100644 index 0d66eedb85..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicComboBox/index.jelly +++ /dev/null @@ -1,38 +0,0 @@ - - - - -
    - - - - - - - -
    -
    -     -     diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicDropDownListBox/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicDropDownListBox/index.jelly deleted file mode 100644 index 7366121636..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicDropDownListBox/index.jelly +++ /dev/null @@ -1,41 +0,0 @@ - - - - -
    - - - - - - - - - - -
    -
    -     -     diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/City/config.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/City/config.groovy deleted file mode 100644 index b7dd63efdc..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/City/config.groovy +++ /dev/null @@ -1,7 +0,0 @@ -package jenkins.plugins.ui_samples.FormFieldValidationWithContext.City; - -def f = namespace(lib.FormTagLib) - -f.entry(title:"City Name", field:"name") { - f.textbox() -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/State/config.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/State/config.groovy deleted file mode 100644 index 53fdcd9ef9..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/State/config.groovy +++ /dev/null @@ -1,19 +0,0 @@ -package jenkins.plugins.ui_samples.FormFieldValidationWithContext.State; - -def f = namespace(lib.FormTagLib) - -f.entry(title:"State Name", field:"name") { - f.textbox() -} - -f.nested { - table { - f.section(title:"Capital city") { - f.property(field:"capital") - } - - f.entry(title:"Other cities") { - f.repeatableProperty(field:"cities") - } - } -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.groovy deleted file mode 100644 index ef37b97a2f..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.groovy +++ /dev/null @@ -1,22 +0,0 @@ -package jenkins.plugins.ui_samples.FormFieldValidationWithContext; - -import lib.JenkinsTagLib -import lib.FormTagLib - -def f=namespace(FormTagLib.class) - -t=namespace(JenkinsTagLib.class) - -namespace("/lib/samples").sample(title:_("Context-sensitive form validation")) { - p { - raw(_("blurb.context")) - raw(_("blurb.otheruse")) - raw(_("blurb.contrived")) - } - - f.form { - f.entry(title:"States") { - f.repeatableProperty(field:"states") - } - } -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.properties b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.properties deleted file mode 100644 index 16568baed4..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.properties +++ /dev/null @@ -1,9 +0,0 @@ -blurb.context=\ - Form field validation can access values of the nearby input controls, which is useful for performing \ - complex context sensitive form validation. -blurb.otheruse=\ - The same technique can be also used for auto-completion, populating combobox/listbox, and so on. -blurb.contrived=\ - The example below is bit contrived, but all the input elements are named 'name' (for city name and state name), \ - and we use @RelativePath so that the validation of the state name refers to the capital name, \ - and the validation of the city name refers to the state name. \ No newline at end of file diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/ChoiceEntry/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/ChoiceEntry/config.jelly deleted file mode 100644 index 9fba952485..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/ChoiceEntry/config.jelly +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/Config/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/Config/config.jelly deleted file mode 100644 index abe64ce337..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/Config/config.jelly +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/SimpleEntry/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/SimpleEntry/config.jelly deleted file mode 100644 index e98b3ef2a3..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/SimpleEntry/config.jelly +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/configure.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/configure.jelly deleted file mode 100644 index e48529c9be..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/configure.jelly +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -

    Configuration

    - - - - - - - - - -     -     -     diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/index.jelly deleted file mode 100644 index 2ed9ee4a9f..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/index.jelly +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - -

    - Configure me! -

    - -

    - Current configuration: -

    - 
    -                ${it.configFile.asString()}
-
    -     -     -     diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/header.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/header.groovy deleted file mode 100644 index 58f1cde3fe..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/header.groovy +++ /dev/null @@ -1,6 +0,0 @@ -package jenkins.plugins.ui_samples.InpageNavigationWithBreadcrumb - -def l=namespace(lib.LayoutTagLib.class) - -// put them under your l.layout -l.breadcrumb(title:"Click me! Click me!",id:"id-of-breadcrumb-item") diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.groovy deleted file mode 100644 index 44b9d6e4c7..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.groovy +++ /dev/null @@ -1,21 +0,0 @@ -package jenkins.plugins.ui_samples.InpageNavigationWithBreadcrumb; - -import lib.JenkinsTagLib - -def st=namespace("jelly:stapler") - -t=namespace(JenkinsTagLib.class) - -namespace("/lib/samples").sample(title:_("In-page navigation via breadcrumb")) { - raw(_("blurb")) - - script """ - Event.observe(window,"load",function(){ - var menu = new breadcrumbs.ContextMenu(); - menu.add('#section1',rootURL+"/images/24x24/gear.png","Section 1") - menu.add('#section2',rootURL+"/images/24x24/gear.png","Section 2") - breadcrumbs.attachMenu('id-of-breadcrumb-item',menu); - }); -""" - -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.properties b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.properties deleted file mode 100644 index 46400ae7b9..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.properties +++ /dev/null @@ -1,5 +0,0 @@ -blurb=You can add arbitrary additional items to the breadcrumb bar (see above), and associate menus with them. \ - This mechanism is convenient for adding anchors to a large page and provide quick access to the key parts. \ - A very typical place where you want to do this is in the configuration page. There's a <f:breadcrumb-config-outline> \ - tag specifically for this use case, which parses <f:section>s and use that to build the context menu. \ - See the freestyle job configuration page for an example of using this tag. \ No newline at end of file diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/JavaScriptProxy/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/JavaScriptProxy/index.jelly deleted file mode 100644 index 7192bbca48..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/JavaScriptProxy/index.jelly +++ /dev/null @@ -1,45 +0,0 @@ - - - - -

    - In Jenkins, you can export arbitrary server-side Java object to JavaScript via a proxy, - then invoke their methods from JavaScript. See the Wiki for more details. - In this sample, we call a method on the server to increment a counter. This object is a singleton, - so you'll see the same counter value across all the browsers. -

    - - - -
    - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ModularizeViewScript/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ModularizeViewScript/index.groovy deleted file mode 100644 index 5ea27a431f..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ModularizeViewScript/index.groovy +++ /dev/null @@ -1,43 +0,0 @@ -package jenkins.plugins.ui_samples.ModularizeViewScript - -import org.kohsuke.stapler.jelly.groovy.JellyBuilder -import jenkins.util.groovy.AbstractGroovyViewModule - -namespace("/lib/samples").sample(title:_("Define View Fragments Elsewhere")) { - - // normally this is how you generate tags, - // but these are actually just a syntax sugar for method calls to the "builder" object (which is set as the delegate of the script for you) - h2("One") - div (style:"border:1px solid blue") { - p("some pointless text") - } - - // so all we need to do is to pass around this delegate object and then you can generate fragments - // from elsewhere - new SomeGenerator(builder).generateSomeFragment() -} - - -// I defined this class here just to make the sample concise. -// this class can be defined anywhere, and typically you'd do this somewhere in your src/main/groovy -class SomeGenerator extends AbstractGroovyViewModule { - SomeGenerator(JellyBuilder builder) { - super(builder) - } - - def generateSomeFragment() { - h2("Two") - div(style:"background-color:gray; padding:2em") { - p("Hello") // once inside a closure, no explicit 'b.' reference is needed. this is just like other Groovy builders - - // calling other methods - generateMoreFragment("Testing generation"); - } - } - - def generateMoreFragment(String msg) { - h2(msg); - f.textarea(); - } -} - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.groovy deleted file mode 100644 index 8326b55ac3..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.groovy +++ /dev/null @@ -1,48 +0,0 @@ -package jenkins.plugins.ui_samples.NavigationContextMenu; - -import lib.JenkinsTagLib - -def st=namespace("jelly:stapler") - -t=namespace(JenkinsTagLib.class) - -def example(html) { - tr { - td { - text(html) - } - td { - raw(html) - } - } -} - -namespace("/lib/samples").sample(title:_("Navigational context menu integration")) { - raw(_("blurb")) - - h2(_("Defining context menu")) - raw(_("blurb.define")) - - h2(_("Breadcrumb integration")) - raw(_("blurb.breadcrumb")) - - - h2(_("Model hyperlink")) - raw(_("blurb.modelLink")) - table(border:1) { - example "self" - example "up" - } - - raw(_("blurb.modelLink.inside")) - table(border:1) { - example "self" - example "up" - } - - raw(_("blurb.tltr")) - table(border:1) { - example "self" - example "up" - } -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.properties b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.properties deleted file mode 100644 index 5af5fd3150..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.properties +++ /dev/null @@ -1,27 +0,0 @@ -blurb=

    Jenkins consists of a large and complex graph of domain objects (ModelObject), where each node in the graph is a web page and edges are hyperlinks. \ - To help users navigate quickly on this graph, Jenkins provides a mechanism to attach context menus to model objects, \ - which can be used to hop multiple edges without going through individual hyperlinks. - -blurb.define=

    To define a context menu on ModelObject, implement ModelObjectWithContextMenu. \ - See the example for how to implement this method. - -blurb.breadcrumb=

    Implementing ModelObjectWithContextMenu is sufficient for the core to show the context menu \ - for your model object in the breadcrumb. Hover your mouse over the breadcrumb of this page to see context menu \ - associated with this sample. \ -

    \ - In addition, implementing \ - ModelObjectWithChildren \ - enables you to show children of your model object in the breadcrumb when you click the \u2018>\u2019 icon that separates \ - breadcrumb items. - -blurb.modelLink=

    By adding CSS class "model-link" to the <a> tags pointing to model objects with context menu, \ - you can enable the context menu support to that hyperlink. For example: - -blurb.modelLink.inside=\ -

    Unless the hyperlink appears inline, it is often better to pre-allocate a space for the context menu anchor \ - that appears when the mouse hovers over. To do this, also add the 'inside' CSS element. For example: - - -blurb.tltr=

    By default, context menu appears below the link ,but this is inconvenient when model links line up in a vertical list. \ - Add additional "tl-tr" CSS class (read it as 'top-left of the context menu to top-right of the target anchor) to \ - make context menu appear on the right. \ No newline at end of file diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.groovy deleted file mode 100644 index 8d1e6e8197..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.groovy +++ /dev/null @@ -1,22 +0,0 @@ -package jenkins.plugins.ui_samples.NotificationBar; - -import lib.JenkinsTagLib - -def st=namespace("jelly:stapler") - -t=namespace(JenkinsTagLib.class) - -namespace("/lib/samples").sample(title:_("Notification Bar")) { - raw(_("blurb")) - - raw("To show a notification bar, call notificationBar.show('message')") - button(onclick:"notificationBar.show('This is a notification');", "Show a notification bar") - - raw(_("blurb.hide")) - button(onclick:"notificationBar.hide();", "Hide it now") - - raw(_("blurb.stock")) - button(onclick:"notificationBar.show('it worked!', notificationBar.OK );", "OK") - button(onclick:"notificationBar.show('something went wrong',notificationBar.WARNING);", "WARNING") - button(onclick:"notificationBar.show('something went wrong',notificationBar.ERROR);", "ERROR") -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.properties b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.properties deleted file mode 100644 index da9ba766a4..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.properties +++ /dev/null @@ -1,6 +0,0 @@ -blurb=

    Notification bar shows a message that disappears in a few seconds. \ - It is typically used to provide feedback for asynchronous operations. - -blurb.hide=

    A notification bar will auto-hide itself, but you can programmatically hide it via notificationBar.hide() - -blurb.stock=

    For typical notifications, there are several pre-defined option set available as constants that you can use as notificationBar.show(msg,notificationBar.OK) \ No newline at end of file diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressBar/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressBar/index.groovy deleted file mode 100644 index 7118008c41..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressBar/index.groovy +++ /dev/null @@ -1,30 +0,0 @@ -package jenkins.plugins.ui_samples.ProgressBar; - -import lib.JenkinsTagLib - -def st=namespace("jelly:stapler") - -t=namespace(JenkinsTagLib.class) - -namespace("/lib/samples").sample(title:_("Progress Bar")) { - // in this sample, we add extra margin around them - style(".progress-bar {margin:1em;}") - p("This page shows you how to use the progress bar widget") - - p("The 'pos' parameter controls the degree of progress, 0-100") - t.progressBar(pos:30) - t.progressBar(pos:60) - t.progressBar(pos:90) - p("-1 will draw the progress bar in the 'indeterminate' state"); - t.progressBar(pos:-1) - - p("The 'red' parameter turns the progress bar to red. Used to indicate that it's overdue") - t.progressBar(pos:99, red:true) - t.progressBar(pos:-1, red:true) - - p("Tooltip can be added with the 'tooltip' parameter. It can contain arbitrary HTML. Hover your mouse below to see.") - t.progressBar(pos:70, tooltip:"Allows arbitrary html") - - p("Hyperlink can be added with the 'href' pointer. Click the progress bar below") - t.progressBar(pos:70, href:"http://jenkins-ci.org/") -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressivelyRendered/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressivelyRendered/index.jelly deleted file mode 100644 index b8a949b284..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressivelyRendered/index.jelly +++ /dev/null @@ -1,50 +0,0 @@ - - - - -

    - Shows how to do something slow on the server while displaying progress. -

    - -
    - Enter a big number: -
    - - -

    Factors of ${number}:

    - -
      - - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/Root/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/Root/index.jelly deleted file mode 100644 index baa8682cfa..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/Root/index.jelly +++ /dev/null @@ -1,60 +0,0 @@ - - - - - -

      UI Samples

      - -

      Groovy Templates

      - - - - -
      ${s.displayName}
      -
      - -
      -       -       -
      - -

      Jelly Templates

      - - - - -
      ${s.displayName}
      -
      - -
      -       -       -
      - -       -       -       diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea/index.groovy deleted file mode 100644 index 25f8d94435..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea/index.groovy +++ /dev/null @@ -1,33 +0,0 @@ -def st=namespace("jelly:stapler") - -namespace("/lib/samples").sample(title:_("Syntax Highlighted Text Area")) { - p("CodeMirror can be used to turn ordinary text area into syntax-highlighted content-assistable text area") - - // this loads the necessary JavaScripts, if it hasn't loaded already - // the first we load is the mode definition file (mode as in Emacs mode) - // the second is the theme. - // - // for other modes, look for "clike.js" in your IDE and see adjacent folders. - st.adjunct(includes:"org.kohsuke.stapler.codemirror.mode.clike.clike") - st.adjunct(includes:"org.kohsuke.stapler.codemirror.theme.default") - - // TODO: adjunct tag doesn't work because 'wroteHEAD' is not set correctly - // TODO: provide abstraction that hides CSS hookup - - // this text area is what we convert to the super text area - // we use CSS class to hook up the initialization script. In this particular demo, - // the ID attribute can be used, but in more general case (such as when you use this in your Builder, etc., - // a single web page may end up containing multiple instances of such text area, so the CSS class works better. - textarea("class":"my-groovy-textbox", style:"width:100%; height:10em") - - // see CodeMirror web site for more about how to control the newly instantiated text area. - script(""" - Behaviour.specify("TEXTAREA.my-groovy-textbox", "SyntaxHighlightedTextArea", 0, function(e) { - var w = CodeMirror.fromTextArea(e,{ - mode:"text/x-groovy", - lineNumbers: true - }).getWrapperElement(); - w.setAttribute("style","border:1px solid black; margin-top: 1em; margin-bottom: 1em") - }); - """) -} diff --git a/ui-samples-plugin/src/main/resources/lib/samples/sample.jelly b/ui-samples-plugin/src/main/resources/lib/samples/sample.jelly deleted file mode 100644 index b5250eada4..0000000000 --- a/ui-samples-plugin/src/main/resources/lib/samples/sample.jelly +++ /dev/null @@ -1,51 +0,0 @@ - - - - - Page layout for UI samples and variable bindings that emulate the form environment. - - Page title - - - - - - - -

      ${title}

      -

      - -

      -

      Source Files

      - -

      Sample

      - -       -       -       diff --git a/ui-samples-plugin/src/main/resources/lib/samples/taglib b/ui-samples-plugin/src/main/resources/lib/samples/taglib deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/war/pom.xml b/war/pom.xml index 1c278dee71..c9d24474d5 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -452,14 +452,12 @@ THE SOFTWARE. stapler.resourcePath ../core/src/main/resources; - ../ui-samples-plugin/src/main/resources; hudson.bundled.plugins - ${basedir}/../ui-samples-plugin/target/test-classes/the.hpl, ${project.build.directory}/${project.build.finalName}/WEB-INF/plugins/*.hpi -- GitLab From b9437154d8b20023d5242ac4e063a0d63ac2b5da Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 4 Oct 2013 18:19:49 -0400 Subject: [PATCH 0098/1630] ClassicPluginStrategy.DETACHED_LIST could confuse ClassicPluginStrategyTest by injecting dependencies on split plugins that have an index.jelly. --- .../hudson/ClassicPluginStrategyTest.java | 9 ++++----- .../testDependencyClassLoader.zip | Bin 4601 -> 4689 bytes .../testDisabledDependencyClassLoader.zip | Bin 2879 -> 1972 bytes 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/test/src/test/java/hudson/ClassicPluginStrategyTest.java b/test/src/test/java/hudson/ClassicPluginStrategyTest.java index 3737744e89..26779a1371 100644 --- a/test/src/test/java/hudson/ClassicPluginStrategyTest.java +++ b/test/src/test/java/hudson/ClassicPluginStrategyTest.java @@ -50,13 +50,12 @@ public class ClassicPluginStrategyTest extends HudsonTestCase { // Test data has: foo3 depends on foo2,foo1; foo2 depends on foo1 // (thus findResources from foo3 can find foo1 resources via 2 dependency paths) PluginWrapper p = jenkins.getPluginManager().getPlugin("foo3"); - String res = p.getIndexPage().toString(); - assertTrue(res + "should be foo3", res.contains("/foo3/")); + String res; // In the current impl, the dependencies are the parent ClassLoader so resources // are found there before checking the plugin itself. Adjust the expected results // below if this is ever changed to check the plugin first. - Enumeration en = p.classLoader.getResources("index.jelly"); + Enumeration en = p.classLoader.getResources("test-resource"); for (int i = 0; en.hasMoreElements(); i++) { res = en.nextElement().toString(); if (i < 2) @@ -65,7 +64,7 @@ public class ClassicPluginStrategyTest extends HudsonTestCase { else assertTrue("In current impl, " + res + "should be foo3", res.contains("/foo3/")); } - res = p.classLoader.getResource("index.jelly").toString(); + res = p.classLoader.getResource("test-resource").toString(); assertTrue("In current impl, " + res + " should be foo1 or foo2", res.contains("/foo1/") || res.contains("/foo2/")); } @@ -79,7 +78,7 @@ public class ClassicPluginStrategyTest extends HudsonTestCase { public void testDisabledDependencyClassLoader() throws Exception { PluginWrapper p = jenkins.getPluginManager().getPlugin("foo4"); - Enumeration en = p.classLoader.getResources("index.jelly"); + Enumeration en = p.classLoader.getResources("test-resource"); for (int i = 0; en.hasMoreElements(); i++) { String res = en.nextElement().toString(); if (i == 0) diff --git a/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDependencyClassLoader.zip b/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDependencyClassLoader.zip index 63ebd2dc442beae0df1cea754e95e77f73ea00ee..f016ea70702f54dcd1b5e45b057f5fbc1c5b4c99 100644 GIT binary patch delta 3711 zcmaKvc|4SB8^;Gjj3tpQDNeRBC~MZFBpF5qlYObNjBV@*dB~DbmPz&{H6;6(vPY%P zSjIG#BzswlNyZxSj?+0O@9917{e14{^E`jt-_Ldb@%vrZZ(WQce)b}a3A`T!0X-(4@q52OJKre=U!P$BIGAQDl5yn#>2_zNC5n16L`=GoiFDuNI zRf>rgW2$mW+ha4*09q?3U}<+k@kID7Q2xFnr#Xc=*dz4j@~(b+c~O`9@1|Bowd-+iK$BGSM~XRSFxvRp6V0_{u?yB# zW28u{QS6f!>XLgIQ@%|G0hsU2Rf;Q*mJ^wuoUgy+A*)@Ux7PhMSlXpEriLHpKYg5M z*~H6KjgMekvRLcduKk2$yrx22I+as(uAY?p{rcehjn6K5Fc?72!apw;Z)t&jl!Ae} zxTnu^l@GPzdo^#2-x(IQHH=)0?_S2YFCt(|3I?WeG}@8@A|AE`Kzt2)6lrm7gx9fV z?%j(t&Rd2C)Y}+ONjt<}5% zd!{rSHE~ZuS+WV9ft#h(N;Gg`H~{cHPdC4lc*~90~DoP(Z4%Zys?;bL70p8!JO~V*(d4wI!C7rrL9km<4 zU_WD33c82)y>?luiTqIP4w|9WYr(c;oqvwS-i!!Pd;CF!4uwl zLsPT@48$HH-buevuz91mAf>bSa!|^YYTQ{#?J139rVUH+kdb z@YwD*6Ay2b)j|g(d<)_g@obFxlH$|i2l$K5D2~ALj|C|nCd$qiAp6fncyQl)b(!aA zLO?tso(79gF&*auJ1SjKq#+Q{B|O5ViB?&3BAetspuXjMOiDaYe{E_q>WM_t`cjUA7j;F$UJ!eahQnH+wx~3JX$MYK6Pn zSrlT}S(_Qx=Nu02a=RkB+nFS(j(5}D&f$mKVeQxs0Ks%)+p)@j*yNwy#?UiWqr#yd zj@5~I-mlzh(%(Zi(pHMXMy$U>AIy`s-p=oac(Lf+Ad_ zWxO`iHLReZfNs+5g@7fRzaJ+Tg%-e+6$o|}VttT-6!L!mr4sv!Z4>wyE}{nV6KmBeajVIQt=4>e$(lvi>oIg9Bjp4ruj-5D~ZKI>pt&0stja`3IWlY2%Qm2>u5 zW2>L1#S~7KQgD0dIKZc_RXZg&xG{J%7FslsY%)S_uGyYs&4Z-KH?DY1-^yv2D$>hQ zF-O^IL|l8^rpAz#fu-8z7WyTrX?s#XlP-);R`oNz3!#Z1-R zLO#AN6>B;K?aAC!%pHa*s1c+-4UaU<&6<*r9y)nDamHa?1}Ikyz%>>>#!{Fw`mr^& zr5&6IJAChl2_L=(5B7>dDh$)158Zq|kndV%!qZ9v+jN~$W#73zeMAVj6+HXwQkqwd zl*i=a=J%NM%a)n=nFhY;y8?G@1bg661N@AIvt4!rP*jYRrJdSRXTXUx)s052?t$k{ zswhrAo1dR-1YVi2+3&Y1V7fCbyD^SzFSL#+vDz&o^?UhD7N#@ho6qPak_3;mZ(y=;8a$>+$4Pa%rq8GcK>@e##zN zL?e%Apr{6%J#LX55pSSi8b4kcBV))H*>@tT3ph-=5!La07Tf%GN1Z|Cy z;I++8HsU_5@SB=cRjn#tCOST%kh_ymI;m;=w{(;KmhRVRS7$o|w`e=08yt>1V-=Qs zBdfVt{!;i!F|4p+x!XBLYGlnFQK8}#$LM#F9T-Td`bxNt83$7nNE z3!~TOD@Qa4(a8+e;;*M|Y$i|O@4LuzN|;Gwy>R>DQY8(=t=MGmv;EHDyq+Me$i5?6 ztLifb?sVB6kRZNItK5<8^E1I?e)-@q87LE?T*~7Q#d@AfLC5lh^C1|yy~W(N&T|!~ zSs0#!a(b&}r*fh=_$9c*m>17J*W9JpY`S6(Hals)qAS+qPsKKa4*;%owZ{IdVk1od zZ5qj=Pa}d)w{&oPLmUY*$I}G`T695gSoh_#aK&Ixi%HIHX0LJ)KRcovxOG%s^i#+^ zBxO}yazCfX`{Vg&(FA9!*{Ghdn^;NaHDHY1rW<~=>E!VL)29E~rEkX?UP7O42z)%D z9L3agckjj5DKZU^MZaZfU%wWlI;hOQ#W1u)xWLxD$qY-=YR~G2>HB$^P}dzUokzm)&A5ex+APn zdv$)Y*i%xTErgu*!B3@qvkBR6Lki9KYS>43Hxdos!(@gsSRSn19`Zotc8Y9=HqX@Y zjvDLMw-L0wMz3AKW4x>lSD~*)q-URX9O+w$O$XyLJrQlDf9X_mmrl_$d!3^ev8P!B zfLM(XZ;+M{^^>ldBShZun=Zc#iWi(@sNZ!#Mh+hB+^3p<3|##kQ&l<` zf*LO9{jk|xFku$@TV_UDiq-wJ)J&{tane2ehhtM;Fs*!JB%=852_=V$MccTE~56(%Tb=MOsQqk8>x~cZv&iO z<0D>WqS5uqz<8MH-y)2_A9;kHXh07mc0P9p8s;B?<{ypr2ahgq`ua7~{NT~E2>@!- zF`#pQMjSfsfAsC$<^39P{=$JkgouP)w4ZT@PTh$+zZ41ly!Ee>#BQuN%g-X|Sj8VH vijLhGG=9PUr2gu5yQv8}?Ei&T_#3<9hQDB$=|zA*%=9Ope#z7{@>RlA_3#5Lw3{yRu$QWlOSUo60g845J~8?Z&SLF3M zoi8un9_+ww0PP*%f%L&B*;sP`O#9b#%oOOiO%O9M0s=AW0z|;feNlop02v-?&1J0_?C0uf zHiKk8Wd&yWA^rIeSFRYqH6)oXvX`rzKB{k_+4qJ=_jFYcMxa$~pA37u)-|=AOzC2AK03s!2MN7dGn!(n43m+sUWoiKE>~8P8m>e4h6D^)`gi1{pARd|PUu*3!oc2b+n7$nPt?s3CrboEQTMs%;&q2_2GE4p)Y zpH7(%oUz+==1uNmk`y3%zE9ZF=sHt$lQaGV;|{B2AhBrTPV?B~CpvAe6apCpM;xP=xT)NMfI9rW@i0I#B4k^+CBsi_Jv z!`nG8P1n9jwdOr3Pi=q&j|T(w!pdo36&>Pca0;~}x!S5|>e5IW>h?Vu~|2Lk2MtOwXS#D>x^s#YGsPP>}TxVm4qRRzp{wB0* zF`Wx3H5`+l=7NgXX`8;i;;}y0mOZ)cLTU%gD62x|9r1PW`lhTKgI_ zd|808IB3oeUyJ<>L|6r8QyRsptn|tx7{&NfN#w)OXG}{bxc-RQdL`L*rDIU}HZv$$ zH{ixLK{hUdq7?|Lpi7N<2Hj+r`SHCb`7YA&nzXaED@`nLL#8yir^tYKF{8SIB+~Zy zIYm5y#$ZY?ThYE^55K9gN1Csb*rPW=8-*nle57{9RIG!Fns9qDe1NRaq)Ev7i{gsM zMiw1}jTsWL%v7&FEy4JbP+$aG$8F!eLMLMNZ)wc3h;u0*ty?WcBpl<4YYk3$6QZ54 zZ+fM0S&)dGj>t%~`oksW(HT93ngkPp&_7z@$KpcbPF>wSd^^BW4WpXi)cHnZke%>W z`Q)|B{D-1JpxJgooDnT#Pd19(=jL_a{lF#lc7@+P9s$0#8aI$m2G2S>>le~lnwhrf zO*>t0qO7CeInnjz=&yRC^0(gXnfgg@zR8W%ce#Q5Q*Z7t%ctF^U`7s!mtIMTFl4q* zEzQozPxC@Yr-xQGZVlV+D_*86V29AxEy(HnX*S(m4b4ehDFZ9%^T57!C3|h z*I)q%xQS;J+}88>@yTh`k#sMmJIe<{&bvpqB59eC-6W#efdg+I;>EOgV0b%DQWmsq z1g!kREoi|?M_ zp1Ui{zhlRYy4mrx&~b{R-*e-bjlmQj>Y5gj5QS=?TrEKg>kim&cg%YP>L$5Cn>1fV ztdg6}%&+9Pmd?&BXwkCdB`K{sm9FMtS-g`ap-vxH@nC($i$cY!p4aMJRe_ghPZjkN z`wzr?Y~gd4+#Z{6npa1Cyu8dJFghHH_$7$8RN*3xd#{D66 zd>Iv%UKnf&+WVR%8V(%?FVOfo!XjBy?imxAT_ZQ)N}(ESp5$BtTm z-(%h5Qt4hzDoUsre$+&G;h)nD>VX3zq$7q-+EVdxOX2HJXi7&vS>K2otqeS5F*~fT zuRimjP~zPnN2ir}7ssQ{JN_$6YWRztt4Pdg(Dyi}Qv4Iq`jNDa`#mK~J|jA${jF2F zgLTQeo+Epz5PPTRPNnuvWGv3Y6WadJwVYpm?{1NSJu>|W8G4wl!^00>2$?ju!N(~+ zt4*&ZxI6pYSW3+0mx;eCxHnADGRVErX`f9jFPPWa<6q-eX(}y$*Sq0J1uVDN^rh*_ z6R^hrvF=&O&8c}!ouclZ-(jR;t^DT9iS}C;94r%IttynUVcH?{O3&1l#Xb&M+FK$` zx>g^(q)?SAw}SFjnu1<8`IPnNuD$44p8@WwlNytr5lY@e8s!DyE`>V03jq!dFR8sz ztnu$fL1EG$t*!iAdvk_M{0mTYSne!QQh8vlL$3gSE;no{Wm5VT;=N<2bT|TL-tB87 z#r?gFYPYu0E>3?i6sIYf#IE{&j5np2bWkOeKTjFeA8RFes;A(3Hk#mZfbA+lFYcKX zw~sTUY|T}{vgE_;cCL_Eo)S0?rg^gMQnwJ@4}PkT&OO#xY%c(-P~dHY@%dz5I}z6< z{_5PhgeZ0c?Gs?VC9+Gup`jhWzBH1-IB@*9(}tV@;=U ze_7n`tMYYWf8F@42`O{`Na)uxpd-JQz(0}SPG`=WyYl4{`+Kth02dLmh529gu$k@G WQrJYZux?`5=pTN1^%Cjv0Pq)yP8Jsc diff --git a/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDisabledDependencyClassLoader.zip b/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDisabledDependencyClassLoader.zip index 5dd55f0fa22dca20068795110ff5afb14894dbfd..81caae376b4ae7ea31df0a73aaa02d0885228d4f 100644 GIT binary patch delta 1729 zcmZ|Qc{o&S9Ki9z7`tr6BwI<6EX~LgMMO7a&sb}cG#S?z#bgP`Bovi(Y(vUT8#9!# zb&1O*8B7^nqLgI_ku_wQJJWL2({rEmocDdt`Q!8a&OhH%D?<}Ew?{(wHUa=32%JYx z7+dS{HSqHQfCMi92m|uKDZD=hdqyh+=ZA6<0w75V#@5xDJr0Br5rBv9Jp=%_%R_x3 z9uUGO%uxWKGx?DDm&3P3kfQ|n5zb)!1GT>xjQw_w?>P6*2CzN{SD;?SH+1p=fF}o) z_(8zn@w!?*0oeZ}uEv$X^>F}^DGa9H3m}d*Y3IO_0JUh*=;Gfm|3ST*M~?InRD%S* zPV*p+;8vrpG%7d4+|W7*ov16oP04MhV)CMaM9bd`R9VuCf?GycHtlv8AT_|ErdenNbp4jU7xm6-UYuIzxY}kL>o7#19=<_exc0=Dm0#Jl*>hDk-nfC7BGV zkV1})iyg@A@>4DuDZSUUu*J>_abqRkbu+CQhiZ0t*sP1Gh4kv_MuxIK$BtcMfp^a_ znRF&SMBBEev3hmTGFO%K$ga4?asQp{iJLU*8RJ1KN<-RCAG_Ib^=Gm zGs4ls*r2Jk@j`kT!QV1uJ0pC?6J>X4BYR)+oX)kp)hkM*-tNR)N>;AQF|V0N4Y)yk zBI%&qvJ8w;%6>q9_^~b@lF{LK#o z^H+{qP!cJpF_V#XA*|V=Rs9&7e1burLbmL?#pfS7h~?zKH1~2}n`&H;eRUwwda0n1 z5j<+Oa(+>IssYbplo|H2#-;wr+TEvK9*!ycyWq%Cg-N^78E0e_V)g=Pc_hDJaJVT> zx>|u8A)f$a>d|2As@K)WTOIt{&CJh&PX;Qa+wxYCFFgi=r{`YxZaSWk4w^KQ%G~1{ zs1bOJww}ka@vlNB#NWuC=sbMQnbIH`0X0PnNf;$5P@on|(EApuS@#n$j$BJ#jn&1jPQGr zAS!x}*v(>J4O^nV!Ss5BwGE~18VTKVzQ4^S-ca9UG!yiDmPimWlo5dT%prvmO!}%n zOs;9qu%xxu{z`Q-h&mt^OfXBM@Rjz)T+wQ8-XW-*m6Vg}dMpPNZmU#_x+BqAS;R87 zvmp9Oq&Ip=?Mx#iI3~;@6H<;&L$MgNm2V8%+1J*#z|1`|`69Wtc8^PxzDlY*g6eC* zI~iSZU0Lpa%E=ffILuaHb6jCO5hmab-;E8j)Z0){&v|d)YSV;T+h#-~Ci9f)Vq*A2 zgks0?VPR5C(B4cHG3qRL%N1L9D4+D)Q7*5hvc+d8Gs`@^W=e`|Fz!H?@*YocYc5l) z^4_|C%Fv$IB%Q>g-X*OkhG3|W^^~6J9ule(R_76{l-$c!iR(n}zLQVluas|Z;fKeH z2-fm0-SSlAbdrZx5%Np1!EecieaSAT;J|Gn_xNMLpO$BppBK`Rcs xo^p=%J-(dw27UV%{50RMCI8L=0F8L{2X4LVKeOv9l%M-K5Y9En*&lp)`WG_+<^=!% literal 2879 zcmaKudpy(o8^FI~G55JFexcD#j?AqgsoYXBHh1MR48y|AJ-Krdk&LMvjUs2&nQJa{ zEr&QRl`e!Xl>0~rp~!E`uPmqY+g_j7Yy0DQUeELXJm2s8!I*M`B>)KP8>Nb(i}s(o=L%3m^#~(W1k=SruA0rgYtrv}2D!7L??;0C3R~ zZ^ep~4BJeK4Y(BFPAFFBHsrUA9q69vWZt3B9iIJ(FEQWdR1hAL+nT4evw)s5KfN$C zsp(Xnw7s5aT)sDL!pJi`r2LeHdb4Ve^UEqs`2Odmzh%I+p_!sh*RaC1U6c$^0zDM- zai3Bt&g&4Sj0xsh4BKxT6~MI1@;YGfvc;x3S1CiyVRVmvWz{GcHluy&g&#tZ?9x9F z6=TyQ^g)4~PHW$Oj0hlRsx=u_tp`tRoo`$~Lnh(K-ID&>jOTXO8{UYjB?%yl86*?4 zHn}6`L$z$_L-@;+Xcf?+OQGnU=m9a~%+9q{9*ik31f>aX<^cf!lnVebESmgZ88SV_ z4LD%3_(B2V>0rFKU!V$`T2DaGcEk2g-7cG;p#O#g>&seZcj`o&81AVjA*cd^% zd#M_SGy1kB&^5c|6QBl3kvMwLV2HFqlB_yaB#|BzC{5+n3Bjp5ji1n}D#hmQ%pFHb zGJ3kY3_GL_Ur>@3PgYB`&!4g@-uLHgB5`E-^AT6%nt*(iRLa|6nOR|Qhj4Mo)a0)V zrh2o~#3H}b`ARPb84yS*49&*o10?yDu?T^sII+FogpH2{0E;!#H$+?6f8}8~fDQ*R*G^msd z8o#73C?||c1h{S4o$^8&43p)4VRdfFIvWEMvFY)X;<$QTNFc(8=#6mq4s>-p?cvUz z0Cp!=|MxI%3{a~3k7Ebr$l~emzaQa6^!^t83uPUnz^td|kQ)#?(XR5FR63v#55yM} zl5Wt8s5wzyV3GL0DjZ@1to*h_c}TcI03UJJH^BWGuYRNSyURMC!WlI@=f;;A_fTzd zS1~$66|Y^nLA~#ve3@M%RJ1vcTLi3g2K;qsaz#x|?8oSGhWhiw#hoh5Xw z)!OKNhDjyz0Mc~0xuGNL0lfcH{ zu*4XQaDfJ^tH*Fd#b$iHKy4RgVrtHN(86aQRq69bGOq@!A;%;Or#!Mo3Mu0rnKvcI z#wM}~wq}pR-eumzkHW|<6{0lbqLHy27bHA`_^2yXu45%`#j!r_`byl>>lvL--GTN@ZMWA9E2WThjGl%NFT#bw? zpR+BWw?iI>Cpmq2_CC;94Z;pM(gK!chczD>4n?b9U5H#bLg zd%Ffz*Z!Hfd`qMGu0yD|_~_wdBbpy^c!K8`B>Qq5lQ^(6fb&RiZP;Qw#cZ4;F%OoE zH;o`sSGvVtXoWkidejExjwlDp=UNpPdj(OzH>tQoduziYhpjE9aD*#YYT>HR%esU$ zGgq>gY+C5K(Jk7C_tysHO^?bHQvNt4?k_DX@!nC+D$4uAoD)N=QT7XXW!7Oi(6>8e znUN5@CnYplnff240Ph~_bDymkb3qT` z(b?9=+Ju>yC*r0tg@55SA#wo z%X=;GwNBjLg1_Rpolojr(6ffMdE`MdL`}DKT}suXX=}fM@s`D_c9^;I+Ni3#P_E0& z>NVlh5y|=vYC=1#uZ!VRMU#8|)H!M`{D@E)Zxd6R0m}@zo${mKv2F zNW0>gbFXlF0H`BYtb}q$@OaH7ZE-LL)pkrBbV(y10)BwkVj2q*#`J=d_%Y zqn^ExAo8TD$k!LEto50)7BB$N`PeU35EqPlW3%D3G(RBtP0e}*vFx9mdk*CLp0l3g z-+aE2V_M&w<^K)MK)&0ZvkJD`Ii)B1Llp@e88|!x`EGj7Vm9lJk0aHpej;lT`7S>j zd&pN+uyyhOQgBwYs$a*Mg0r!2{@mOcr_*FOsws&5{IgU)xb){e{?msWz++;gxi^6S w(~j#cv+c-PC)U>(#5N_ybPErARM@Ms1*@k%2>aiE0VKg Date: Tue, 1 Oct 2013 19:09:56 +0200 Subject: [PATCH 0099/1630] German localization for "Disable remember me" option --- .../help-disableRememberMe_de.html | 4 ++++ .../security/GlobalSecurityConfiguration/index_de.properties | 1 + 2 files changed, 5 insertions(+) create mode 100644 core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-disableRememberMe_de.html diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-disableRememberMe_de.html b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-disableRememberMe_de.html new file mode 100644 index 0000000000..060ef51cc5 --- /dev/null +++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-disableRememberMe_de.html @@ -0,0 +1,4 @@ +
      + Wählen Sie diese Option, um die "Meine Anmeldedaten auf diesem Rechner speichern"-Option + vom Benutzeranmeldedialog zu entfernen. +
      diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_de.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_de.properties index affa1cebc7..ed694c8119 100644 --- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_de.properties +++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_de.properties @@ -23,6 +23,7 @@ LOADING=LADE DATEN Enable\ security=Jenkins absichern TCP\ port\ for\ JNLP\ slave\ agents=TCP-Port f\u00fcr JNLP-Slave +Disable\ remember\ me=Deaktiviere "Anmeldedaten speichern" Markup\ Formatter=Markup-Formatierer Access\ Control=Zugriffskontrolle Security\ Realm=Benutzerverzeichnis (Realm) -- GitLab From b19f4650d7cc146e28398a33ad0625d46991e27f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 6 Oct 2013 11:27:00 -0700 Subject: [PATCH 0100/1630] [FIXED JENKINS-18366] Winstone is now powered by Jetty --- changelog.html | 5 +++++ pom.xml | 5 ++++- war/pom.xml | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/changelog.html b/changelog.html index a07bb6c40c..95abae9583 100644 --- a/changelog.html +++ b/changelog.html @@ -71,6 +71,11 @@ Upcoming changes
    • Breadcrumb bar moves away from header when scrolling past end of page on OS X. (issue 19803) +
    • + "java -jar jenkins.war" now runs on Jetty8. Command line options are still compatible. + (issue 18366) +
    • + "java -jar jenkins.war" gets the "--spdy" option to enable SPDY.
    diff --git a/pom.xml b/pom.xml index 7cff659191..d2def83e67 100644 --- a/pom.xml +++ b/pom.xml @@ -630,6 +630,9 @@ THE SOFTWARE. 1.${java.level} + + org.eclipse.jetty.spdy.* + @@ -654,7 +657,7 @@ THE SOFTWARE. org.codehaus.mojo extra-enforcer-rules - 1.0-alpha-5 + 1.0-beta-1+kohsuke diff --git a/war/pom.xml b/war/pom.xml index c9d24474d5..7c6e23c89d 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -51,7 +51,7 @@ THE SOFTWARE. org.jenkins-ci executable-war - 1.28 + 1.29 provided @@ -103,7 +103,7 @@ THE SOFTWARE. --> org.jenkins-ci winstone - 0.9.10-jenkins-47 + 2.0 test -- GitLab From b533f77065dabd94ef7c85ccea366be6497d13b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= Date: Mon, 7 Oct 2013 10:38:11 +0200 Subject: [PATCH 0101/1630] Amend #616 --- changelog.html | 3 +++ .../src/main/resources/lib/hudson/artifactList.jelly | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index 95abae9583..957f9f3c06 100644 --- a/changelog.html +++ b/changelog.html @@ -76,6 +76,9 @@ Upcoming changes (issue 18366)
  • "java -jar jenkins.war" gets the "--spdy" option to enable SPDY. +
  • + Expand all/Collapse all functionality for artifact tree view. + (pull request 616) diff --git a/core/src/main/resources/lib/hudson/artifactList.jelly b/core/src/main/resources/lib/hudson/artifactList.jelly index 4118c98392..92d6e00418 100644 --- a/core/src/main/resources/lib/hudson/artifactList.jelly +++ b/core/src/main/resources/lib/hudson/artifactList.jelly @@ -76,13 +76,13 @@ THE SOFTWARE. - +
    + + ${%Expand all} + + ${%Collapse all} +
    - Expand all + diff --git a/core/src/main/resources/lib/layout/progressiveRendering/progressiveRendering.js b/core/src/main/resources/lib/layout/progressiveRendering/progressiveRendering.js index e56ab5bb53..e1ea3435a8 100644 --- a/core/src/main/resources/lib/layout/progressiveRendering/progressiveRendering.js +++ b/core/src/main/resources/lib/layout/progressiveRendering/progressiveRendering.js @@ -22,23 +22,23 @@ * THE SOFTWARE. */ -function progressivelyRender(handler, callback) { +function progressivelyRender(handler, callback, statusId) { function checkNews(response) { var r = response.responseObject(); if (r.status == 'done') { callback(r.data); - $('status').style.display = 'none'; + $(statusId).style.display = 'none'; } else if (r.status == 'canceled') { // TODO ugly; replace with single tr of class=unknown? - $$('#status .progress-bar-done')[0].innerHTML = 'Aborted.'; + $$('#' + statusId + ' .progress-bar-done')[0].innerHTML = 'Aborted.'; } else if (r.status == 'error') { - $$('#status .progress-bar-done')[0].style.width = '100%'; - $$('#status .progress-bar-left')[0].style.width = '0%'; - $('status').className = 'progress-bar red'; + $$('#' + statusId + ' .progress-bar-done')[0].style.width = '100%'; + $$('#' + statusId + ' .progress-bar-left')[0].style.width = '0%'; + $(statusId).className = 'progress-bar red'; } else { callback(r.data); - $$('#status .progress-bar-done')[0].style.width = (100 * r.status) + '%'; - $$('#status .progress-bar-left')[0].style.width = (100 - 100 * r.status) + '%'; + $$('#' + statusId + ' .progress-bar-done')[0].style.width = (100 * r.status) + '%'; + $$('#' + statusId + ' .progress-bar-left')[0].style.width = (100 - 100 * r.status) + '%'; checkNewsLater(500); } } -- GitLab From c5e23739fa85a6fe93ad90a35da4051a2767c874 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 6 Dec 2013 18:21:57 -0500 Subject: [PATCH 0530/1630] [JENKINS-20892] Partial fix of poor scalability in /builds and related displays. --- core/src/main/java/hudson/Functions.java | 4 +- .../hudson/model/BuildTimelineWidget.java | 4 +- core/src/main/java/hudson/model/Job.java | 2 +- core/src/main/java/hudson/model/User.java | 14 ++- core/src/main/java/hudson/util/RunList.java | 5 +- .../java/jenkins/widgets/BuildListTable.java | 89 +++++++++++++++++++ .../model/BuildTimelineWidget/control.jelly | 3 - .../hudson/model/Job/buildTimeTrend.jelly | 9 +- .../resources/hudson/model/User/builds.jelly | 1 + .../resources/lib/hudson/buildListTable.jelly | 86 ++++++++++++------ 10 files changed, 165 insertions(+), 52 deletions(-) create mode 100644 core/src/main/java/jenkins/widgets/BuildListTable.java diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 50c115a850..8c9e72edd9 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -150,6 +150,7 @@ import org.kohsuke.stapler.jelly.InternationalizedStringExpression.RawHtmlArgume import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import hudson.util.RunList; import java.util.concurrent.atomic.AtomicLong; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; @@ -1431,7 +1432,8 @@ public class Functions { } /** - * Returns a sub-list if the given list is bigger than the specified 'maxSize' + * Returns a sub-list if the given list is bigger than the specified {@code maxSize}. + * Warning: do not call this with a {@link RunList}, or you will break lazy loading! */ public static List subList(List base, int maxSize) { if(maxSize builds; public BuildTimelineWidget(RunList builds) { - this.builds = builds; + this.builds = builds.limit(20); // TODO instead render lazily } + @Deprecated public Run getFirstBuild() { return builds.getFirstBuild(); } + @Deprecated public Run getLastBuild() { return builds.getLastBuild(); } diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index aef474184a..29a7cd9425 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -1269,7 +1269,7 @@ public abstract class Job, RunT extends Run data = new DataSetBuilder(); - for (Run r : getBuilds()) { + for (Run r : getNewBuilds()) { if (r.isBuilding()) continue; data.add(((double) r.getDuration()) / (1000 * 60), "min", diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java index 90e6f472f0..e0b3cd5e87 100644 --- a/core/src/main/java/hudson/model/User.java +++ b/core/src/main/java/hudson/model/User.java @@ -24,6 +24,7 @@ */ package hudson.model; +import com.google.common.base.Predicate; import com.infradna.tool.bridge_method_injector.WithBridgeMethods; import hudson.*; import hudson.model.Descriptor.FormException; @@ -451,19 +452,14 @@ public class User extends AbstractModelObject implements AccessControlled, Descr /** * Gets the list of {@link Build}s that include changes by this user, * by the timestamp order. - * - * TODO: do we need some index for this? */ @WithBridgeMethods(List.class) public RunList getBuilds() { - List r = new ArrayList(); - for (AbstractProject p : Jenkins.getInstance().getAllItems(AbstractProject.class)) - for (AbstractBuild b : p.getBuilds().newBuilds()){ - if (relatedTo(b)) { - r.add(b); - } + return new RunList>(Jenkins.getInstance().getAllItems(Job.class)).filter(new Predicate>() { + @Override public boolean apply(Run r) { + return r instanceof AbstractBuild && relatedTo((AbstractBuild) r); } - return RunList.fromRuns(r); + }); } /** diff --git a/core/src/main/java/hudson/util/RunList.java b/core/src/main/java/hudson/util/RunList.java index 891e4ff8b5..add82eb890 100644 --- a/core/src/main/java/hudson/util/RunList.java +++ b/core/src/main/java/hudson/util/RunList.java @@ -186,9 +186,10 @@ public class RunList extends AbstractList { /** * Returns elements that satisfy the given predicate. + * Warning: this method mutates the original list and then returns it. + * @since TODO */ - // for compatibility reasons, this method doesn't create a new list but updates the current one - private RunList filter(Predicate predicate) { + public RunList filter(Predicate predicate) { size = null; first = null; base = Iterables.filter(base,predicate); diff --git a/core/src/main/java/jenkins/widgets/BuildListTable.java b/core/src/main/java/jenkins/widgets/BuildListTable.java new file mode 100644 index 0000000000..1a29abe1e6 --- /dev/null +++ b/core/src/main/java/jenkins/widgets/BuildListTable.java @@ -0,0 +1,89 @@ +/* + * The MIT License + * + * Copyright 2013 Jesse Glick. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package jenkins.widgets; + +import hudson.Functions; +import hudson.model.BallColor; +import hudson.model.Run; +import java.util.ArrayList; +import java.util.List; +import jenkins.util.ProgressiveRendering; +import net.sf.json.JSON; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; + +@Restricted(DoNotUse.class) // only for buildListTable.jelly +public class BuildListTable extends ProgressiveRendering { + + private final List results = new ArrayList(); + private Iterable> builds; + + /** Jelly cannot call a constructor with arguments. */ + public void setBuilds(Iterable> builds) { + this.builds = builds; + } + + @Override protected void compute() throws Exception { + double decay = 1; + for (Run build : builds) { + if (canceled()) { + return; + } + JSONObject element = new JSONObject(); + calculate(build, element); + synchronized (results) { + results.add(element); + } + // Since we cannot predict how many there will be, just show an ever-growing bar. + decay *= .99; + progress(1 - decay); + } + } + + @Override protected synchronized JSON data() { + JSONArray d = JSONArray.fromObject(results); + results.clear(); + return d; + } + + private void calculate(Run build, JSONObject element) { + BallColor iconColor = build.getIconColor(); + element.put("iconColorOrdinal", iconColor.ordinal()); + element.put("iconColorDescription", iconColor.getDescription()); + element.put("url", build.getUrl()); + element.put("buildStatusUrl", build.getBuildStatusUrl()); + element.put("parentUrl", build.getParent().getUrl()); + element.put("parentFullDisplayName", Functions.breakableString(Functions.escape(build.getParent().getFullDisplayName()))); + element.put("displayName", build.getDisplayName()); + element.put("timestampString", build.getTimestampString()); + element.put("timestampString2", build.getTimestampString2()); + Run.Summary buildStatusSummary = build.getBuildStatusSummary(); + element.put("buildStatusSummaryWorse", buildStatusSummary.isWorse); + element.put("buildStatusSummaryMessage", buildStatusSummary.message); + } + +} diff --git a/core/src/main/resources/hudson/model/BuildTimelineWidget/control.jelly b/core/src/main/resources/hudson/model/BuildTimelineWidget/control.jelly index 3941925526..f695275f06 100644 --- a/core/src/main/resources/hudson/model/BuildTimelineWidget/control.jelly +++ b/core/src/main/resources/hudson/model/BuildTimelineWidget/control.jelly @@ -77,10 +77,7 @@ THE SOFTWARE. // theme1.autoWidth = true; // Set the Timeline's "width" automatically. // Set autoWidth on the Timeline's first band's theme, // will affect all bands. - theme1.timeline_start = new Date(${it.firstBuild.timeInMillis-24*60*60*1000}); - theme1.timeline_stop = new Date(${it.lastBuild.timeInMillis+24*60*60*1000}); - var d = new Date(${it.lastBuild.timeInMillis}); var bandInfos = [ // the bar that shows outline Timeline.createBandInfo({ diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly index ec41aca715..44af0bde57 100644 --- a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly +++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly @@ -34,8 +34,6 @@ THE SOFTWARE.

    ${%Build Time Trend}

    - -
    [Build time graph]
    @@ -51,7 +49,7 @@ THE SOFTWARE. ${%Slave} - + ${r.iconColor.description} @@ -73,11 +71,6 @@ THE SOFTWARE.
    - - - ${%More than 1 builds are needed for the trend report.} - - diff --git a/core/src/main/resources/hudson/model/User/builds.jelly b/core/src/main/resources/hudson/model/User/builds.jelly index 7b7b63834f..cc4a6f28dc 100644 --- a/core/src/main/resources/hudson/model/User/builds.jelly +++ b/core/src/main/resources/hudson/model/User/builds.jelly @@ -30,6 +30,7 @@ THE SOFTWARE. ${%title(it)} + diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly index cf2b131db2..296633dd41 100644 --- a/core/src/main/resources/lib/hudson/buildListTable.jelly +++ b/core/src/main/resources/lib/hudson/buildListTable.jelly @@ -43,33 +43,65 @@ THE SOFTWARE. ${%Status} - - - - - - ${b.iconColor.description} - - - - - - ${b.displayName} - - - ${b.timestampString} - - - - - - - ${%Console output} - - - - + + + ${handler.setBuilds(attrs.builds)} + -- GitLab From 46e3a5c56f67c10522a94d657e4f943ec6e5e28e Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 6 Dec 2013 21:10:10 -0500 Subject: [PATCH 0531/1630] Trying to make test pass after changing the progress bar to use a generated ID. Also trying (without success) to diagnose an earlier local test failure. --- .../java/hudson/model/AsynchPeopleTest.java | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/test/src/test/java/hudson/model/AsynchPeopleTest.java b/test/src/test/java/hudson/model/AsynchPeopleTest.java index bbb83969a2..b2b8174fe0 100644 --- a/test/src/test/java/hudson/model/AsynchPeopleTest.java +++ b/test/src/test/java/hudson/model/AsynchPeopleTest.java @@ -24,6 +24,8 @@ package hudson.model; +import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; +import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; import static org.junit.Assert.*; import org.junit.Rule; @@ -41,10 +43,25 @@ public class AsynchPeopleTest { @Test public void display() throws Exception { User.get("bob"); JenkinsRule.WebClient wc = j.createWebClient(); - HtmlPage page = wc.goTo("asynchPeople"); + HtmlPage page; + try { + page = wc.goTo("asynchPeople"); + } catch (FailingHttpStatusCodeException x) { + System.err.println(x.getResponse().getResponseHeaders()); + System.err.println(x.getResponse().getContentAsString()); + throw x; + } assertEquals(0, wc.waitForBackgroundJavaScript(120000)); - assertEquals("display: none;", page.getElementById("status").getAttribute("style")); - /* TODO this still fails occasionally, for reasons TBD: + boolean found = false; + for (HtmlElement table : page.getElementsByTagName("table")) { + if (table.getAttribute("class").contains("progress-bar")) { + found = true; + assertEquals("display: none;", table.getAttribute("style")); + break; + } + } + assertTrue(found); + /* TODO this still fails occasionally, for reasons TBD (I think because User.getAll sometimes is empty): assertNotNull(page.getElementById("person-bob")); */ } -- GitLab From fa36dbfb16366d146f07becd1081efcd7b7003a7 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 6 Dec 2013 21:29:52 -0700 Subject: [PATCH 0532/1630] Remove javadoc reference to non-existent class in test source code --- test/src/main/java/org/jvnet/hudson/test/FakeLauncher.java | 1 - 1 file changed, 1 deletion(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/FakeLauncher.java b/test/src/main/java/org/jvnet/hudson/test/FakeLauncher.java index d13fca3edd..9ca68019d4 100644 --- a/test/src/main/java/org/jvnet/hudson/test/FakeLauncher.java +++ b/test/src/main/java/org/jvnet/hudson/test/FakeLauncher.java @@ -12,7 +12,6 @@ import java.io.OutputStream; * * @author Kohsuke Kawaguchi * @see PretendSlave - * @see MockFakeLauncher */ public interface FakeLauncher { /** -- GitLab From eb62812d276199b13d23375fa31c155454b83c29 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 6 Dec 2013 21:30:56 -0700 Subject: [PATCH 0533/1630] Fully qualify JenkinsRule reference from package-info javadoc --- test/src/main/java/org/jvnet/hudson/test/package-info.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/package-info.java b/test/src/main/java/org/jvnet/hudson/test/package-info.java index e290594812..69eaaff28f 100644 --- a/test/src/main/java/org/jvnet/hudson/test/package-info.java +++ b/test/src/main/java/org/jvnet/hudson/test/package-info.java @@ -22,6 +22,6 @@ * THE SOFTWARE. */ /** - * Test harness for Jenkins and its plugins. Start exploring from {@link JenkinsRule}. + * Test harness for Jenkins and its plugins. Start exploring from {@link org.jvnet.hudson.test.JenkinsRule}. */ -package org.jvnet.hudson.test; \ No newline at end of file +package org.jvnet.hudson.test; -- GitLab From 69ff77d43c0c9c4d2ad76aafb2eb811ecc7e1bd2 Mon Sep 17 00:00:00 2001 From: Idan Bidani Date: Sat, 7 Dec 2013 00:29:41 -0500 Subject: [PATCH 0534/1630] [FIXED JENKINS-20219] Filter for installed plugins Added filter support for installed tab of plugin manager --- .../main/resources/hudson/PluginManager/installed.jelly | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly index 7d5d239f42..3900d7ed42 100644 --- a/core/src/main/resources/hudson/PluginManager/installed.jelly +++ b/core/src/main/resources/hudson/PluginManager/installed.jelly @@ -30,6 +30,11 @@ THE SOFTWARE. + +
    + ${%Filter}: + +
    @@ -48,7 +53,7 @@ THE SOFTWARE. - + - + ]]> ${handler.setBuilds(attrs.builds)} -- GitLab From f313db963c4b9a664b35a0bbaf2fd3d260d2cff3 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 9 Dec 2013 17:53:13 -0500 Subject: [PATCH 0540/1630] =?UTF-8?q?Using=20Prototype=E2=80=99s=20new=20E?= =?UTF-8?q?lement(=E2=80=A6)=20is=20barely=20more=20verbose=20than=20Templ?= =?UTF-8?q?ate,=20and=20seems=20safer.=20(More=20practical=20for=20conditi?= =?UTF-8?q?onal=20inclusion=20of=20elements.)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/lib/hudson/buildListTable.jelly | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly index b0529ad586..29da06161f 100644 --- a/core/src/main/resources/lib/hudson/buildListTable.jelly +++ b/core/src/main/resources/lib/hudson/buildListTable.jelly @@ -43,30 +43,33 @@ THE SOFTWARE. - + ${handler.setBuilds(attrs.builds)} -- GitLab From c9bb2bb3d38006baec1f747c0a14978cdd2ce1c2 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 9 Dec 2013 18:19:33 -0500 Subject: [PATCH 0541/1630] More consistent formatting. --- core/src/main/resources/lib/hudson/buildListTable.jelly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly index 29da06161f..2c4bb71578 100644 --- a/core/src/main/resources/lib/hudson/buildListTable.jelly +++ b/core/src/main/resources/lib/hudson/buildListTable.jelly @@ -48,8 +48,8 @@ THE SOFTWARE. var p = $$('projectStatus'); for (var x = 0; data.length > x; x++) { var e = data[x]; - p.insert( - new Element('tr'). + p. + insert(new Element('tr'). insert(new Element('td', {data: e.iconColorOrdinal}). insert(new Element('a', {href: '${jobBaseUrl}' + e.url}). insert(new Element('img', {src: '${imagesURL}/${iconSize}/' + e.buildStatusUrl, alt: e.iconColorDescription, 'class': 'icon${iconSize}'})))). -- GitLab From 335aa624a58efa4de3cfca1d7280c8a2f4d435ad Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 9 Dec 2013 18:25:38 -0500 Subject: [PATCH 0542/1630] Inefficient to call Behaviour.applySubtree on rows we added earlier. --- .../resources/lib/hudson/buildListTable.jelly | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly index 2c4bb71578..7bdd1118dc 100644 --- a/core/src/main/resources/lib/hudson/buildListTable.jelly +++ b/core/src/main/resources/lib/hudson/buildListTable.jelly @@ -48,26 +48,26 @@ THE SOFTWARE. var p = $$('projectStatus'); for (var x = 0; data.length > x; x++) { var e = data[x]; - p. - insert(new Element('tr'). - insert(new Element('td', {data: e.iconColorOrdinal}). - insert(new Element('a', {href: '${jobBaseUrl}' + e.url}). - insert(new Element('img', {src: '${imagesURL}/${iconSize}/' + e.buildStatusUrl, alt: e.iconColorDescription, 'class': 'icon${iconSize}'})))). - insert(new Element('td'). - insert(new Element('a', {href: '${jobBaseUrl}' + e.parentUrl, 'class': 'model-link'}). - update(e.parentFullDisplayName)). - insert('\u00A0'). - insert(new Element('a', {href: '${jobBaseUrl}' + e.url, 'class': 'model-link inside'}). - update(e.displayName.escapeHTML()))). - insert(new Element('td', {data: e.timestampString2, tooltip: '${%Click to center timeline on event}', onclick: 'javascript:tl.getBand(0).scrollToCenter(Timeline.DateTime.parseGregorianDateTime("' + e.timestampString2 + '"))'}). - update(e.timestampString.escapeHTML())). - insert(new Element('td', {style: e.buildStatusSummaryWorse ? 'color: red' : ''}). - update(e.buildStatusSummaryMessage.escapeHTML())). - insert(new Element('td'). - insert(new Element('a', {href: '${jobBaseUrl}' + e.url + 'console'}). - insert(new Element('img', {src: '${imagesURL}/${subIconSize}/terminal.png', alt: '${%Console output}', border: 0}))))); + var tr = new Element('tr'). + insert(new Element('td', {data: e.iconColorOrdinal}). + insert(new Element('a', {href: '${jobBaseUrl}' + e.url}). + insert(new Element('img', {src: '${imagesURL}/${iconSize}/' + e.buildStatusUrl, alt: e.iconColorDescription, 'class': 'icon${iconSize}'})))). + insert(new Element('td'). + insert(new Element('a', {href: '${jobBaseUrl}' + e.parentUrl, 'class': 'model-link'}). + update(e.parentFullDisplayName)). + insert('\u00A0'). + insert(new Element('a', {href: '${jobBaseUrl}' + e.url, 'class': 'model-link inside'}). + update(e.displayName.escapeHTML()))). + insert(new Element('td', {data: e.timestampString2, tooltip: '${%Click to center timeline on event}', onclick: 'javascript:tl.getBand(0).scrollToCenter(Timeline.DateTime.parseGregorianDateTime("' + e.timestampString2 + '"))'}). + update(e.timestampString.escapeHTML())). + insert(new Element('td', {style: e.buildStatusSummaryWorse ? 'color: red' : ''}). + update(e.buildStatusSummaryMessage.escapeHTML())). + insert(new Element('td'). + insert(new Element('a', {href: '${jobBaseUrl}' + e.url + 'console'}). + insert(new Element('img', {src: '${imagesURL}/${subIconSize}/terminal.png', alt: '${%Console output}', border: 0})))); + p.insert(tr); + Behaviour.applySubtree(tr); } - Behaviour.applySubtree(p); } -- GitLab From 42fcaa6f5eb1081c2eced785b86f5b81c6434d5c Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 9 Dec 2013 18:35:36 -0500 Subject: [PATCH 0543/1630] Also need to refresh table sorting as we go. --- core/src/main/resources/lib/hudson/buildListTable.jelly | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly index 7bdd1118dc..71458c1e5b 100644 --- a/core/src/main/resources/lib/hudson/buildListTable.jelly +++ b/core/src/main/resources/lib/hudson/buildListTable.jelly @@ -68,6 +68,7 @@ THE SOFTWARE. p.insert(tr); Behaviour.applySubtree(tr); } + ts_refresh(p); } -- GitLab From 1e13c13e1c35fe883737c364f463cc24416a9615 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 9 Dec 2013 18:37:00 -0500 Subject: [PATCH 0544/1630] Factored out RunListProgressiveRendering supertype. --- .../java/jenkins/widgets/BuildListTable.java | 40 +-------- .../widgets/RunListProgressiveRendering.java | 81 +++++++++++++++++++ 2 files changed, 83 insertions(+), 38 deletions(-) create mode 100644 core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java diff --git a/core/src/main/java/jenkins/widgets/BuildListTable.java b/core/src/main/java/jenkins/widgets/BuildListTable.java index 1a29abe1e6..ec8e60e368 100644 --- a/core/src/main/java/jenkins/widgets/BuildListTable.java +++ b/core/src/main/java/jenkins/widgets/BuildListTable.java @@ -27,50 +27,14 @@ package jenkins.widgets; import hudson.Functions; import hudson.model.BallColor; import hudson.model.Run; -import java.util.ArrayList; -import java.util.List; -import jenkins.util.ProgressiveRendering; -import net.sf.json.JSON; -import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; @Restricted(DoNotUse.class) // only for buildListTable.jelly -public class BuildListTable extends ProgressiveRendering { +public class BuildListTable extends RunListProgressiveRendering { - private final List results = new ArrayList(); - private Iterable> builds; - - /** Jelly cannot call a constructor with arguments. */ - public void setBuilds(Iterable> builds) { - this.builds = builds; - } - - @Override protected void compute() throws Exception { - double decay = 1; - for (Run build : builds) { - if (canceled()) { - return; - } - JSONObject element = new JSONObject(); - calculate(build, element); - synchronized (results) { - results.add(element); - } - // Since we cannot predict how many there will be, just show an ever-growing bar. - decay *= .99; - progress(1 - decay); - } - } - - @Override protected synchronized JSON data() { - JSONArray d = JSONArray.fromObject(results); - results.clear(); - return d; - } - - private void calculate(Run build, JSONObject element) { + @Override protected void calculate(Run build, JSONObject element) { BallColor iconColor = build.getIconColor(); element.put("iconColorOrdinal", iconColor.ordinal()); element.put("iconColorDescription", iconColor.getDescription()); diff --git a/core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java b/core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java new file mode 100644 index 0000000000..5ab72a8a38 --- /dev/null +++ b/core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java @@ -0,0 +1,81 @@ +/* + * The MIT License + * + * Copyright 2013 Jesse Glick. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package jenkins.widgets; + +import hudson.model.Run; +import hudson.util.RunList; +import java.util.ArrayList; +import java.util.List; +import jenkins.util.ProgressiveRendering; +import net.sf.json.JSON; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; + +/** + * Makes it possible to incrementally render some information from a {@link RunList}. + */ +@Restricted(NoExternalUse.class) +public abstract class RunListProgressiveRendering extends ProgressiveRendering { + + /** + * Since we cannot predict how many runs there will be, just show an ever-growing progress bar. + * The first increment will be sized as if this many runs will be in the total, + * but then like Zeno’s paradox we will never seem to finish until we actually do. + */ + private static final double MAX_LIKELY_RUNS = 20; + private final List results = new ArrayList(); + private Iterable> builds; + + /** Jelly cannot call a constructor with arguments. */ + public void setBuilds(Iterable> builds) { + this.builds = builds; + } + + @Override protected void compute() throws Exception { + double decay = 1; + for (Run build : builds) { + if (canceled()) { + return; + } + JSONObject element = new JSONObject(); + calculate(build, element); + synchronized (results) { + results.add(element); + } + decay *= (1 - 1 / MAX_LIKELY_RUNS); + progress(1 - decay); + } + } + + @Override protected synchronized JSON data() { + JSONArray d = JSONArray.fromObject(results); + results.clear(); + return d; + } + + protected abstract void calculate(Run build, JSONObject element); +} -- GitLab From 14b86d7728fdd4367c3ed7a89b1f5f2a47f417f0 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 9 Dec 2013 18:38:00 -0500 Subject: [PATCH 0545/1630] Display build trend progressively. --- .../java/jenkins/widgets/BuildTimeTrend.java | 65 +++++++++++++++++++ .../hudson/model/Job/buildTimeTrend.jelly | 45 +++++++------ 2 files changed, 91 insertions(+), 19 deletions(-) create mode 100644 core/src/main/java/jenkins/widgets/BuildTimeTrend.java diff --git a/core/src/main/java/jenkins/widgets/BuildTimeTrend.java b/core/src/main/java/jenkins/widgets/BuildTimeTrend.java new file mode 100644 index 0000000000..158ec398ea --- /dev/null +++ b/core/src/main/java/jenkins/widgets/BuildTimeTrend.java @@ -0,0 +1,65 @@ +/* + * The MIT License + * + * Copyright 2013 Jesse Glick. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package jenkins.widgets; + +import hudson.model.AbstractBuild; +import hudson.model.BallColor; +import hudson.model.Node; +import hudson.model.Run; +import jenkins.model.Jenkins; +import net.sf.json.JSONObject; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; + +@Restricted(DoNotUse.class) // only for buildTimeTrend.jelly +public class BuildTimeTrend extends RunListProgressiveRendering { + + @Override protected void calculate(Run build, JSONObject element) { + BallColor iconColor = build.getIconColor(); + element.put("iconColorOrdinal", iconColor.ordinal()); + element.put("iconColorDescription", iconColor.getDescription()); + element.put("buildStatusUrl", build.getBuildStatusUrl()); + element.put("number", build.getNumber()); + element.put("displayName", build.getDisplayName()); + element.put("duration", build.getDuration()); + element.put("durationString", build.getDurationString()); + if (build instanceof AbstractBuild) { + AbstractBuild b = (AbstractBuild) build; + Node n = b.getBuiltOn(); + if (n == null) { + String ns = b.getBuiltOnStr(); + if (ns != null && !ns.isEmpty()) { + element.put("builtOnStr", ns); + } + } else if (n != Jenkins.getInstance()) { + element.put("builtOn", n.getNodeName()); + element.put("builtOnStr", n.getDisplayName()); + } else { + element.put("builtOnStr", hudson.model.Messages.Hudson_Computer_DisplayName()); + } + } + } + +} diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly index 44af0bde57..083493abab 100644 --- a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly +++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly @@ -40,7 +40,7 @@ THE SOFTWARE.
    -
    ${%Uninstall}
    Date: Sat, 7 Dec 2013 05:21:57 -0500 Subject: [PATCH 0535/1630] [JENKINS-20219] Noting #1048. --- changelog.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.html b/changelog.html index c808dd6036..ab6951a887 100644 --- a/changelog.html +++ b/changelog.html @@ -61,6 +61,9 @@ Upcoming changes
  • Hudson shows 0GB free space when space available drops below 1GB. (issue 7776) +
  • + Added filter field for installed plugins tab. + (issue 20219)
  • groovysh command did not work in authenticated Jenkins instances. (issue 17929) -- GitLab From cf9853e5a565450ecc90af6aee8926889461f89f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sat, 30 Nov 2013 18:35:09 +0100 Subject: [PATCH 0536/1630] fixed typos in french translation --- .../resources/hudson/model/AbstractBuild/index_fr.properties | 2 +- core/src/main/resources/lib/layout/breadcrumbBar_fr.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index_fr.properties b/core/src/main/resources/hudson/model/AbstractBuild/index_fr.properties index 0c885cc0a6..e284efe299 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/index_fr.properties +++ b/core/src/main/resources/hudson/model/AbstractBuild/index_fr.properties @@ -35,4 +35,4 @@ Permalinks=Liens permanents Build\ number=Num\u00E9ro de build Build=Construction Build\ Artifacts=Artefacts du build -Took=A dur\u00E9e +Took=A dur\u00E9 diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_fr.properties b/core/src/main/resources/lib/layout/breadcrumbBar_fr.properties index f5a6f81c09..aa6da31c8a 100644 --- a/core/src/main/resources/lib/layout/breadcrumbBar_fr.properties +++ b/core/src/main/resources/lib/layout/breadcrumbBar_fr.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -DISABLE\ AUTO\ REFRESH=Desactiver le rafraichissement automatique +DISABLE\ AUTO\ REFRESH=D\u00E9sactiver le rafra\u00EEchissement automatique ENABLE\ AUTO\ REFRESH=Rafra\u00EEchissement automatique -- GitLab From 587992c3725d43899c80160bd1178b764af9b371 Mon Sep 17 00:00:00 2001 From: Fernando Boaglio Date: Sun, 8 Dec 2013 09:08:38 -0200 Subject: [PATCH 0537/1630] Translation pt_BR - Jenkins Meetup Sao Paulo --- .../cli/client/Messages_pt_BR.properties | 24 +- .../hudson/Messages_pt_BR.properties | 68 +++-- .../PluginManager/advanced_pt_BR.properties | 16 +- .../PluginManager/installed_pt_BR.properties | 20 +- .../PluginManager/sidepanel_pt_BR.properties | 12 +- .../PluginManager/table_pt_BR.properties | 14 +- .../cli/CLIAction/index_pt_BR.properties | 8 +- .../diagnosis/Messages_pt_BR.properties | 4 +- .../OldDataMonitor/manage_pt_BR.properties | 62 ++--- .../message_pt_BR.properties | 8 +- .../hudson/fsp/Messages_pt_BR.properties | 22 +- .../lifecycle/Messages_pt_BR.properties | 8 +- .../_restart_pt_BR.properties | 8 +- .../index_pt_BR.properties | 6 +- .../LogRecorder/configure_pt_BR.properties | 14 +- .../LogRecorder/delete_pt_BR.properties | 4 +- .../LogRecorder/sidepanel_pt_BR.properties | 4 +- .../LogRecorderManager/index_pt_BR.properties | 14 +- .../sidepanel_pt_BR.properties | 10 +- .../config_pt_BR.properties | 6 +- .../MatrixBuild/ajaxMatrix_pt_BR.properties | 4 +- .../MatrixBuild/delete_pt_BR.properties | 3 +- .../configure-entries_pt_BR.properties | 18 +- .../MatrixProject/index_pt_BR.properties | 12 +- .../newJobDetail_pt_BR.properties | 12 +- .../AbstractBuild/index_pt_BR.properties | 18 +- .../AbstractBuild/sidepanel_pt_BR.properties | 14 +- .../AbstractBuild/sidepanel_pt_PT.properties | 4 +- .../AbstractBuild/tasks_pt_BR.properties | 8 +- .../configure-common_pt_BR.properties | 16 +- .../AbstractItem/delete_pt_BR.properties | 14 +- .../AbstractItem/noWorkspace_pt_BR.properties | 20 +- .../AbstractProject/main_pt_BR.properties | 16 +- .../makeDisabled_pt_BR.properties | 12 +- .../sidepanel_pt_BR.properties | 24 +- .../svn-password_pt_BR.properties | 8 +- .../wipeOutWorkspaceBlocked_pt_BR.properties | 6 +- .../AllView/newViewDetail_pt_BR.properties | 6 +- .../model/AllView/noJob_pt_BR.properties | 14 +- .../config_pt_BR.properties | 4 +- .../config_pt_BR.properties | 10 +- .../description_pt_BR.properties | 4 +- .../model/Computer/_script_pt_BR.properties | 4 +- .../model/Computer/delete_pt_BR.properties | 4 +- .../model/Computer/index_pt_BR.properties | 6 +- .../model/Computer/sidepanel_pt_BR.properties | 22 +- .../model/ComputerSet/_new_pt_BR.properties | 4 +- .../ComputerSet/configure_pt_BR.properties | 6 +- .../ComputerSet/sidepanel_pt_BR.properties | 12 +- .../Executor/causeOfDeath_pt_BR.properties | 8 +- .../model/Fingerprint/index_pt_BR.properties | 12 +- .../newJobDetail_pt_BR.properties | 12 +- .../model/Job/buildTimeTrend_pt_BR.properties | 17 +- .../model/Job/configure_pt_BR.properties | 12 +- .../hudson/model/Job/index_pt_BR.properties | 4 +- .../hudson/model/Job/rename_pt_BR.properties | 6 +- .../model/Label/sidepanel_pt_BR.properties | 6 +- .../configure-entries_pt_BR.properties | 24 +- .../ListView/newViewDetail_pt_BR.properties | 4 +- .../LoadStatistics/main_pt_BR.properties | 4 +- .../hudson/model/Messages_pt_BR.properties | 242 +++++++++--------- .../MyView/newViewDetail_pt_BR.properties | 4 +- .../model/MyView/noJob_pt_BR.properties | 4 +- .../MyViewsProperty/config_pt_BR.properties | 4 +- .../NoFingerprintMatch/index_pt_BR.properties | 14 +- .../config_pt_BR.properties | 14 +- .../index_pt_BR.properties | 4 +- .../Permalink/link_pt_BR.properties | 10 +- .../configure-entries_pt_BR.properties | 4 +- .../ProxyView/newViewDetail_pt_BR.properties | 4 +- .../KeepLogBuildBadge/badge_pt_BR.properties | 4 +- .../Run/artifacts-index_pt_BR.properties | 4 +- .../model/Run/confirmDelete_pt_BR.properties | 14 +- .../hudson/model/Run/delete_pt_BR.properties | 12 +- .../hudson/model/Run/logKeep_pt_BR.properties | 16 +- .../Slave/help-launcher_pt_BR.properties | 4 +- .../message_pt_BR.properties | 6 +- .../RestartJenkinsJob/row_pt_BR.properties | 4 +- .../model/UpdateCenter/body_pt_BR.properties | 6 +- .../model/UpdateCenter/index_pt_BR.properties | 6 +- .../UpdateCenter/sidepanel_pt_BR.properties | 15 +- .../hudson/model/User/builds_pt_BR.properties | 4 +- .../hudson/model/User/delete_pt_BR.properties | 4 +- .../model/User/sidepanel_pt_BR.properties | 16 +- .../View/AsynchPeople/index_pt_BR.properties | 12 +- .../hudson/model/View/builds_pt_BR.properties | 4 +- .../model/View/configure_pt_BR.properties | 4 +- .../hudson/model/View/delete_pt_BR.properties | 12 +- .../hudson/model/View/index_pt_BR.properties | 12 +- .../hudson/model/View/noJob_pt_BR.properties | 4 +- .../model/View/sidepanel_pt_BR.properties | 14 +- .../node_monitors/Messages_pt_BR.properties | 18 +- .../index_pt_BR.properties | 4 +- .../message_pt_BR.properties | 6 +- .../ZFSInstaller/confirm_pt_BR.properties | 8 +- .../ZFSInstaller/message_pt_BR.properties | 6 +- .../config_pt_BR.properties | 6 +- .../help_pt_BR.properties | 12 +- .../os/windows/Messages_pt_BR.properties | 10 +- .../scm/SCM/project-changes_pt_BR.properties | 14 +- .../config_pt_BR.properties | 16 +- .../index_pt_BR.properties | 18 +- .../Details/config_pt_BR.properties | 12 +- .../addUser_pt_BR.properties | 12 +- .../config_pt_BR.properties | 12 +- .../firstUser_pt_BR.properties | 4 +- .../index_pt_BR.properties | 12 +- .../sidepanel_pt_BR.properties | 14 +- .../config_pt_BR.properties | 4 +- .../hudson/security/Messages_pt_BR.properties | 25 +- .../SecurityRealm/loginLink_pt_BR.properties | 12 +- .../config_pt_BR.properties | 12 +- .../CommandLauncher/help_pt_BR.properties | 6 +- .../ComputerLauncher/main_pt_BR.properties | 8 +- .../configure-entries_pt_BR.properties | 12 +- .../newInstanceDetail_pt_BR.properties | 12 +- .../slaves/JNLPLauncher/help_pt_BR.properties | 10 +- .../slaves/JNLPLauncher/main_pt_BR.properties | 10 +- .../hudson/slaves/Messages_pt_BR.properties | 24 +- .../ChannelTermination/cause_pt_BR.properties | 4 +- .../LaunchFailed/cause_pt_BR.properties | 4 +- .../Demand/config_pt_BR.properties | 12 +- .../Scheduled/config_pt_BR.properties | 14 +- .../config_pt_BR.properties | 14 +- .../SlaveComputer/disconnect_pt_BR.properties | 6 +- .../SlaveComputer/sidepanel2_pt_BR.properties | 4 +- .../SlaveComputer/sidepanel_pt_BR.properties | 16 +- .../SlaveComputer/systemInfo_pt_BR.properties | 8 +- .../SlaveComputer/threadDump_pt_BR.properties | 6 +- .../ArtifactArchiver/config_pt_BR.properties | 14 +- .../tasks/BatchFile/config_pt_BR.properties | 4 +- .../BuildTrigger/config_pt_BR.properties | 12 +- .../FingerprintAction/index_pt_BR.properties | 14 +- .../tasks/LogRotator/config_pt_BR.properties | 22 +- .../tasks/Maven/config_pt_BR.properties | 14 +- .../hudson/tasks/Messages_pt_BR.properties | 68 ++--- .../tasks/Shell/global_pt_BR.properties | 12 +- .../junit/CaseResult/index_pt_BR.properties | 14 +- .../junit/CaseResult/list_pt_BR.properties | 8 +- .../junit/CaseResult/summary_pt_BR.properties | 4 +- .../junit/ClassResult/body_pt_BR.properties | 14 +- .../junit/ClassResult/list_pt_BR.properties | 4 +- .../junit/History/index_pt_BR.properties | 4 +- .../config_pt_BR.properties | 10 +- .../tasks/junit/Messages_pt_BR.properties | 18 +- .../TestResultAction/index_pt_BR.properties | 6 +- .../config_pt_BR.properties | 12 +- .../tasks/test/Messages_pt_BR.properties | 16 +- .../MetaTabulatedResult/body_pt_BR.properties | 16 +- .../MetaTabulatedResult/list_pt_BR.properties | 4 +- .../TestObject/sidepanel_pt_BR.properties | 6 +- .../floatingBox_pt_BR.properties | 12 +- .../config_pt_BR.properties | 9 +- .../hudson/tools/Messages_pt_BR.properties | 18 +- .../config_pt_BR.properties | 6 +- .../hudson/triggers/Messages_pt_BR.properties | 4 +- .../BuildAction/index_pt_BR.properties | 6 +- .../index_pt_BR.properties | 14 +- .../index_pt_BR.properties | 18 +- .../JNADoublyLoaded/index_pt_BR.properties | 8 +- .../util/NoTempDir/index_pt_BR.properties | 16 +- .../BuildButtonColumn/column_pt_BR.properties | 12 +- .../myViewTabs_pt_BR.properties | 4 +- .../viewTabs_pt_BR.properties | 4 +- .../columnHeader_pt_BR.properties | 12 +- .../LastStableColumn/column_pt_BR.properties | 4 +- .../columnHeader_pt_BR.properties | 12 +- .../hudson/views/Messages_pt_BR.properties | 4 +- .../columnHeader_pt_BR.properties | 12 +- .../columnHeader_pt_BR.properties | 12 +- .../entries_pt_BR.properties | 4 +- .../hudson/widgets/Messages_pt_BR.properties | 4 +- .../message_pt_BR.properties | 4 +- .../management/Messages_pt_BR.properties | 37 +-- .../config_pt_BR.properties | 12 +- .../config_pt_BR.properties | 12 +- .../model/Jenkins/_restart_pt_BR.properties | 4 +- .../Jenkins/_safeRestart_pt_BR.properties | 4 +- .../Jenkins/accessDenied_pt_BR.properties | 4 +- .../model/Jenkins/configure_pt_BR.properties | 14 +- .../model/Jenkins/legend_pt_BR.properties | 16 +- .../model/Jenkins/loginError_pt_BR.properties | 14 +- .../model/Jenkins/login_pt_BR.properties | 12 +- .../model/Jenkins/manage_pt_BR.properties | 18 +- .../projectRelationship-help_pt_BR.properties | 14 +- .../projectRelationship_pt_BR.properties | 12 +- .../model/Jenkins/systemInfo_pt_BR.properties | 14 +- .../model/Jenkins/threadDump_pt_BR.properties | 6 +- .../config_pt_BR.properties | 12 +- .../jenkins/model/Messages_pt_BR.properties | 28 +- .../lib/form/booleanRadio_pt_BR.properties | 4 +- ...breadcrumb-config-outline_pt_BR.properties | 4 +- .../hudson/buildListTable_pt_BR.properties | 14 +- .../lib/hudson/executors_pt_BR.properties | 10 +- .../hudson/listScmBrowsers_pt_BR.properties | 12 +- .../lib/hudson/node_pt_BR.properties | 12 +- .../config-assignedLabel_pt_BR.properties | 12 +- ...ockWhenDownstreamBuilding_pt_BR.properties | 4 +- ...blockWhenUpstreamBuilding_pt_BR.properties | 4 +- .../config-buildWrappers_pt_BR.properties | 12 +- .../project/config-builders_pt_BR.properties | 14 +- .../config-concurrentBuild_pt_BR.properties | 4 +- .../config-disableBuild_pt_BR.properties | 14 +- .../config-publishers2_pt_BR.properties | 4 +- .../config-publishers_pt_BR.properties | 12 +- .../config-quietPeriod_pt_BR.properties | 11 +- .../project/config-scm_pt_BR.properties | 12 +- .../project/config-trigger_pt_BR.properties | 12 +- ...g-upstream-pseudo-trigger_pt_BR.properties | 12 +- .../hudson/project/matrix_pt_BR.properties | 12 +- .../upstream-downstream_pt_BR.properties | 12 +- .../lib/hudson/queue_pt_BR.properties | 18 +- .../lib/hudson/rssBar_pt_BR.properties | 12 +- .../lib/hudson/scriptConsole_pt_BR.properties | 20 +- .../lib/layout/breadcrumbBar_pt_BR.properties | 3 +- .../lib/layout/main-panel_pt_BR.properties | 4 +- .../progressiveRendering_pt_BR.properties | 3 +- .../resources/lib/test/bar_pt_BR.properties | 12 +- .../security/ldap/userSearchBase_pt_BR.html | 2 +- 219 files changed, 1328 insertions(+), 1315 deletions(-) diff --git a/cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties b/cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties index 1131ec8d17..106ba7ce84 100644 --- a/cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties +++ b/cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Reginaldo L. Russinholi, Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,21 +21,21 @@ # THE SOFTWARE. # Version mismatch. This CLI cannot work with this Hudson server -CLI.VersionMismatch=A vers\ufffdo n\ufffdo coincide. Esta CLI n\ufffdo pode funcionar com este servidor Hudson -# Hudson CLI\n\ -# Usage: java -jar jenkins-cli.jar [-s URL] command [opts...] args...\n\ -# Options:\n\ +CLI.VersionMismatch=A vers\u00e3o n\u00e3o coincide. Esta CLI n\u00e3o pode funcionar com este servidor Hudson +# Hudson CLI\n\ +# Usage: java -jar jenkins-cli.jar [-s URL] command [opts...] args...\n\ +# Options:\n\ # \ -s URL : specify the server URL (defaults to the JENKINS_URL env var)\n\ -# \n\ -# The available commands depend on the server. Run the 'help' command to\n\ +# \n\ +# The available commands depend on the server. Run the 'help' command to\n\ # see the list. CLI.Usage=Jenkins CLI\n\ - Uso: java -jar jenkins-cli.jar [-s URL] comando [op\ufffd\ufffdes...] par\ufffdmetros...\n\ - Op\ufffd\ufffdes:\n\ - \ -s URL : a URL do servidor (por padr\ufffdo a vari\ufffdvel de ambiente JENKINS_URL \ufffd usada)\n\ + Uso: java -jar jenkins-cli.jar [-s URL] comando [op\u00e7\u00f5es...] par\u00e2metros...\n\ + Op\u00e7\u00f5es:\n\ + \ -s URL : a URL do servidor (por padr\u00e3o a vari\u00e1vel de ambiente JENKINS_URL \u00e9 usada)\n\ \n\ - Os comandos dispon\ufffdveis dependem do servidor. Execute o comando 'help' para\n\ + Os comandos dispon\u00edveis dependem do servidor. Execute o comando 'help' para\n\ ver a lista. # Neither -s nor the JENKINS_URL env var is specified. -CLI.NoURL=N\ufffdo foi especificado nem '-s' e nem a vari\ufffdvel de ambiente JENKINS_URL +CLI.NoURL=N\u00e3o foi especificado nem '-s' e nem a vari\u00e1vel de ambiente JENKINS_URL diff --git a/core/src/main/resources/hudson/Messages_pt_BR.properties b/core/src/main/resources/hudson/Messages_pt_BR.properties index 2f1a6bb45f..05811b3eea 100644 --- a/core/src/main/resources/hudson/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/Messages_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -24,7 +24,23 @@ FilePath.validateAntFileMask.whitespaceSeprator=\ Espa\u00e7o em branco n\u00e3o pode mais ser usado como separador. Por favor use '','' como separador. FilePath.validateAntFileMask.doesntMatchAndSuggest=\ ''{0}'' n\u00e3o corresponde a nada, mas ''{1}'' sim. Talvez seja isto que voc\u00ea quis dizer? +FilePath.validateRelativePath.noSuchDirectory=Diret\u00f3rio n\u00e3o encontrado: ''{0}'' +FilePath.TildaDoesntWork= ''~'' s\u00f3 \u00e9 suportado apenas pelo shell do Unix +FilePath.validateAntFileMask.portionMatchAndSuggest=''{0}'' n\u00e3o foi encontrado, mas ''{1}'' existe +FilePath.validateAntFileMask.doesntMatchAnything= ''{0}'' n\u00e3o foi encontrada nenhuma correspond\u00eancia +FilePath.validateAntFileMask.doesntMatchAnythingAndSuggest=''{0}'' n\u00e3o foi encontrada nenhuma correspond\u00eancia: mesmo ''{1}'' n\u00e3o existe +FilePath.validateRelativePath.wildcardNotAllowed=Curinga n\u00e3o \u00e9 permitido aqui +FilePath.validateRelativePath.notFile= ''{0}'' n\u00e3o \u00e9 um arquivo +FilePath.validateRelativePath.notDirectory= ''{0}'' n\u00e3o \u00e9 um diret\u00f3rio +FilePath.validateRelativePath.noSuchFile=''{0}'' arquivo n\u00e3o encontrado +FilePath.validateAntFileMask.portionMatchButPreviousNotMatchAndSuggest= ''{0}'' n\u00e3o encontrado: ''{1}'' existe, mas n\u00e3o ''{2}'' +FilePath.validateAntFileMask.doesntMatchAnythingAndSuggest= ''{0}'' n\u00e3o localizado: mesmo ''{1}'' n\u00e3o existe + + +PluginManager.PluginDoesntSupportDynamicLoad.RestartRequired={0} plugin n\u00e3o suporta hot deploy. O Jenkins precisa ser reiniciado para efetivar a atualiza\u00e7\u00e3o +PluginManager.PluginIsAlreadyInstalled.RestartRequired={0} plugin j\u00e1 est\u00e1 instalado.O Jenkins precisa ser reiniciado para efetivar a atualiza\u00e7\u00e3o +Util.millisecond= {0} ms Util.second={0} {0,choice,0#segundos|1#segundo|1the Wiki for more details of this feature.\ +# You can access various features in Jenkins through a command-line tool. See \ +# the Wiki for more details of this feature.\ # To get started, download jenkins-cli.jar, and run it as follows: blurb=\ Voc\u00ea pode acessar v\u00e1rias funcionalidades do Jenkins pelo prompt de comando. Veja \ a Wiki diff --git a/core/src/main/resources/hudson/diagnosis/Messages_pt_BR.properties b/core/src/main/resources/hudson/diagnosis/Messages_pt_BR.properties index 32ba9ec979..12aa009cb0 100644 --- a/core/src/main/resources/hudson/diagnosis/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/diagnosis/Messages_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Reginaldo L. Russinholi, Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -25,4 +25,4 @@ MemoryUsageMonitor.USED=Usada # Total MemoryUsageMonitor.TOTAL=Total # Old Data -OldDataMonitor.DisplayName=Dados Antigos +OldDataMonitor.DisplayName=Dados antigos diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt_BR.properties b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt_BR.properties index 660eb7fa0f..284fc1b089 100644 --- a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt_BR.properties +++ b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Reginaldo L. Russinholi, Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,45 +20,45 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -# \ -# When there are changes in how data is stored on disk, Jenkins uses the following strategy: \ -# data is migrated to the new structure when it is loaded, but the file is not resaved in the \ -# new format. This allows for downgrading Jenkins if needed. However, it can also leave data \ -# on disk in the old format indefinitely. The table below lists files containing such data, \ +# \ +# When there are changes in how data is stored on disk, Jenkins uses the following strategy: \ +# data is migrated to the new structure when it is loaded, but the file is not resaved in the \ +# new format. This allows for downgrading Jenkins if needed. However, it can also leave data \ +# on disk in the old format indefinitely. The table below lists files containing such data, \ # and the Jenkins version(s) where the data structure was changed. -blurb.1=Quando existem mudan\u00E7as em como os dados s\u00E3o armazenados no disco, o Jenkins usa a seguinte estrat\u00E9gia: os dados s\u00E3o migrados para a nova estrutura quando o Jenkins \u00E9 carregado, mas o arquivo n\u00E3o \u00E9 salvo novamente no novo formato. Isto permite o downgrade do Jenkins se necess\u00E1rio. Entretanto, ele tamb\u00E9m pode ser deixado no disco no formato antigo. A tabela abaixo lista os arquivos contendo tais dados, e a(s) vers\u00E3o(\u00F5es) do Jenkins onde a estrutura de dados foi alterada. -# \ -# Sometimes errors occur while reading data (if a plugin adds some data and that plugin is \ -# later disabled, if migration code is not written for structure changes, or if Jenkins is \ -# downgraded after it has already written data not readable by the older version). \ -# These errors are logged, but the unreadable data is then skipped over, allowing Jenkins to \ +blurb.1=Quando existem mudan\u00E7as em como os dados s\u00E3o armazenados no disco, o Jenkins usa a seguinte estrat\u00E9gia: os dados s\u00E3o migrados para a nova estrutura quando o Jenkins \u00E9 carregado, mas o arquivo n\u00E3o \u00E9 salvo novamente no novo formato. Isto permite o downgrade do Jenkins se necess\u00E1rio. Entretanto, ele tamb\u00E9m pode ser deixado no disco no formato antigo. A tabela abaixo lista os arquivos contendo tais dados, e a(s) vers\u00E3o(\u00F5es) do Jenkins onde a estrutura de dados foi alterada. +# \ +# Sometimes errors occur while reading data (if a plugin adds some data and that plugin is \ +# later disabled, if migration code is not written for structure changes, or if Jenkins is \ +# downgraded after it has already written data not readable by the older version). \ +# These errors are logged, but the unreadable data is then skipped over, allowing Jenkins to \ # startup and function properly. -blurb.2=Alguma vezes ocorrem erros enquanto lendo dados (se um plugin adiciona algum dado e este plugin \u00E9 desativado posteriormente, se o c\u00F3digo de migra\u00E7\u00E3o n\u00E3o suporta mudan\u00E7as de estrutura, ou se for feito um downgrade do Jenkins ap\u00F3s ele j\u00E1 ter escrito dados n\u00E3o suportados por vers\u00F5es anteriores). Estes erros s\u00E3o registrados no log, mas os dados ileg\u00EDveis ignorados, permitindo que o Jenkins seja iniciado e funcione apropriadamente. -# \ -# The form below may be used to resave these files in the current format. Doing so means a \ -# downgrade to a Jenkins release older than the selected version will not be able to read the \ -# data stored in the new format. Note that simply using Jenkins to create and configure jobs \ -# and run builds can save data that may not be readable by older Jenkins releases, even when \ -# this form is not used. Also if any unreadable data errors are reported in the right side \ +blurb.2=Algumas vezes ocorrem erros enquanto lendo dados (se um plugin adiciona algum dado e este plugin \u00E9 desativado posteriormente, se o c\u00F3digo de migra\u00E7\u00E3o n\u00E3o suporta mudan\u00E7as de estrutura, ou se for feito um downgrade do Jenkins ap\u00F3s ele j\u00E1 ter escrito dados n\u00E3o suportados por vers\u00F5es anteriores). Estes erros s\u00E3o registrados no log, mas os dados ileg\u00EDveis ignorados, permitindo que o Jenkins seja iniciado e funcione apropriadamente. +# \ +# The form below may be used to resave these files in the current format. Doing so means a \ +# downgrade to a Jenkins release older than the selected version will not be able to read the \ +# data stored in the new format. Note that simply using Jenkins to create and configure jobs \ +# and run builds can save data that may not be readable by older Jenkins releases, even when \ +# this form is not used. Also if any unreadable data errors are reported in the right side \ # of the table above, note that this data will be lost when the file is resaved. -blurb.3=O formul\u00E1rio abaixo pode ser usado para salvar novamente estes arquivos no formato atual. Fazer isso significa que um downgrade para uma vers\u00E3o do Jenkins mais antiga do que a selecionada n\u00E3o ser\u00E1 capaz de ler os dados armazenados no novo formato. Note que simplesmente usando o Jenkins para criar e configurar tarefas e executar constru\u00E7\u00F5es pode salvar dados que n\u00E3o podem ser lidos por vers\u00F5es anteriores do Jenkins,mesmo quando este formul\u00E1rio n\u00E3o \u00E9 usado. Tamb\u00E9m se qualquer erro de dado ileg\u00EDvel for reportado no lado direito da tabela acima, estes dados ser\u00E3o perdidos quando o arquivo for salvo novamente. -# \ -# Eventually the code supporting these data migrations may be removed. Compatibility will be \ -# retained for at least 150 releases since the structure change. Versions older than this are \ +blurb.3=O formul\u00E1rio abaixo pode ser usado para salvar novamente estes arquivos no formato atual. Fazer isso significa que um downgrade para uma vers\u00E3o do Jenkins mais antiga do que a selecionada n\u00E3o ser\u00E1 capaz de ler os dados armazenados no novo formato. Note que simplesmente usando o Jenkins para criar e configurar jobs e executar builds pode salvar dados que n\u00E3o podem ser lidos por vers\u00F5es anteriores do Jenkins,mesmo quando este formul\u00E1rio n\u00E3o \u00E9 usado. Tamb\u00E9m se qualquer erro de dado ileg\u00EDvel for reportado no lado direito da tabela acima, estes dados ser\u00E3o perdidos quando o arquivo for salvo novamente. +# \ +# Eventually the code supporting these data migrations may be removed. Compatibility will be \ +# retained for at least 150 releases since the structure change. Versions older than this are \ # in bold above, and it is recommended to resave these files. blurb.4=Eventualmente o c\u00F3digo que suporta a migra\u00E7\u00E3o de dados pode ser removido. A compatibilidade ser\u00E1 mantida ao menos por 150 vers\u00F5es desde a mudan\u00E7a na estrutura. Vers\u00F5es mais antigas que esta ent\u00E3o em negrito, e \u00E9 recomendado salvar novamente estes arquivos. -# \ +# \ # (downgrade as far back as the selected version may still be possible) blurb.5=\ - (\ufffd poss\ufffdvel fazer o downgrade do Jenkins at\ufffd a vers\ufffdo selecionada) -# \ -# It is acceptable to leave unreadable data in these files, as Jenkins will safely ignore it. \ -# To avoid the log messages at Jenkins startup you can permanently delete the unreadable data \ + (\u00c9 poss\u00edvel fazer o downgrade do Jenkins at\u00e9 a vers\u00e3o selecionada) +# \ +# It is acceptable to leave unreadable data in these files, as Jenkins will safely ignore it. \ +# To avoid the log messages at Jenkins startup you can permanently delete the unreadable data \ # by resaving these files using the button below. -blurb.6=\u00C9 aceit\u00E1vel deixar dados ileg\u00EDveis nestes arquivos, porque o Jenkins ir\u00E1 ignor\u00E1-los. Para evitar mensagens de erro na inicializa\u00E7\u00E3o do Jenkins voc\u00EA pode excluir permanentemente os dados ileg\u00EDveis usando o bot\u00E3o abaixo. +blurb.6=\u00C9 aceit\u00E1vel deixar dados ileg\u00EDveis nestes arquivos, porque o Jenkins ir\u00E1 ignor\u00E1-los. Para evitar mensagens de erro na inicializa\u00E7\u00E3o do Jenkins voc\u00EA pode excluir permanentemente os dados ileg\u00EDveis usando o bot\u00E3o abaixo. Type=Tipo -Discard\ Unreadable\ Data=Descartar Dados Ileg\u00EDveis +Discard\ Unreadable\ Data=Descartar dados ileg\u00EDveis Version=Vers\u00E3o Upgrade=Atualizar Error=Erro @@ -66,4 +66,4 @@ Unreadable\ Data=Dado Ileg\u00EDvel Resave\ data\ files\ with\ structure\ changes\ no\ newer\ than\ Jenkins=Salvar arquivos de dados com mudan\ufffdas de estruturas que n\ufffdo sejam mais novas que o Jenkins No\ old\ data\ was\ found.=Nenhum dado antigo foi encontrado. Name=Nome -Manage\ Old\ Data=Administrar Dados Antigos +Manage\ Old\ Data=Administrar dados antigos diff --git a/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message_pt_BR.properties b/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message_pt_BR.properties index 98f1a25cfa..731d77dda8 100644 --- a/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message_pt_BR.properties +++ b/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Reginaldo L. Russinholi, Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,7 +21,7 @@ # THE SOFTWARE. Dismiss=Descartar -# There appears to be a large number of jobs. Did you know that you can organize your jobs to different views? \ +# There appears to be a large number of jobs. Did you know that you can organize your jobs to different views? \ # You can click '+' in the top page to create a new view any time. -blurb=Parece haver um n\u00FAmero grande de tarefas. Voc\u00EA sabia que pode orgazinar suas tarefas para diferentes visualiza\u00E7\u00F5es? Voc\u00EA pode clicar ''+'' no topo da p\u00E1gina para criar uma nova visualiza\u00E7\u00E3o a qualquer hora. -Create\ a\ view\ now=Criar uma nova visualiza\u00E7\u00E3o agora +blurb=Parece haver um n\u00FAmero grande de jobs. Voc\u00EA sabia que pode organizar seus jobs para diferentes visualiza\u00E7\u00F5es? Voc\u00EA pode clicar ''+'' no topo da p\u00E1gina para criar uma nova visualiza\u00E7\u00E3o a qualquer hora. +Create\ a\ view\ now=Criar uma nova view agora diff --git a/core/src/main/resources/hudson/fsp/Messages_pt_BR.properties b/core/src/main/resources/hudson/fsp/Messages_pt_BR.properties index 8754eddb0e..ae0761c4ab 100644 --- a/core/src/main/resources/hudson/fsp/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/fsp/Messages_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Reginaldo L. Russinholi, Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,18 +21,18 @@ # THE SOFTWARE. # {0} isn''t a job that has a workspace. -WorkspaceSnapshotSCM.IncorrectJobType={0} n\ufffdo \ufffd uma tarefa com uma \ufffdrea de trabalho +WorkspaceSnapshotSCM.IncorrectJobType={0} n\u00e3o \u00e9 uma job com uma workspace # No such permalink ''{0}'' exists for {1} -WorkspaceSnapshotSCM.NoSuchPermalink=N\ufffdo existe o link permanente ''{0}'' para {1} +WorkspaceSnapshotSCM.NoSuchPermalink=N\u00e3o existe o link permanente ''{0}'' para {1} # There''s no qualifying build for the {0} permalink in {1} -WorkspaceSnapshotSCM.NoBuild=N\ufffdo h\ufffd nenhuma constru\ufffd\ufffdo v\ufffdlida para o link permanente {0} em {1} -# \ -# {0} {1} doesn''t have a workspace snapshot attached,\n\ -# probably because when the build was done, no other jobs needed its workspace snapshot.\n\ +WorkspaceSnapshotSCM.NoBuild=N\u00e3o h\u00e1 nenhuma constru\u00e7\u00e3o v\u00e1lida para o link permanente {0} em {1} +# \ +# {0} {1} doesn''t have a workspace snapshot attached,\n\ +# probably because when the build was done, no other jobs needed its workspace snapshot.\n\ # Please run another build in {0} to get the workspace snapshot taken. WorkspaceSnapshotSCM.NoWorkspace=\ - {0} {1} n\ufffdo tem um snapshot da \ufffdrea de trabalho anexecado, \n\ - provavelmente porque quando a constru\ufffd\ufffdo foi feita, nenhuma outra tarefa precisou deste snapshot.\n\ - Por favor execute uma outra constru\ufffd\ufffdo em {0} para que seja tirado um snapshot da \ufffdrea de trabalho. + {0} {1} n\u00e3o tem um snapshot do workspace anexado, \n\ + provavelmente porque quando o build foi feito, nenhum outro job precisou deste snapshot.\n\ + Por favor execute um outro build em {0} para que seja tirado um snapshot do workspace. # No such job ''{0}'' exists. Perhaps you meant ''{1}''? -WorkspaceSnapshotSCM.NoSuchJob=N\ufffdo existe tal tarefa ''{0}''. Talvez voc\ufffd quis dizer ''{1}''? +WorkspaceSnapshotSCM.NoSuchJob=N\u00e3o existe tal job ''{0}''. Talvez voc\u00ea quis dizer ''{1}''? diff --git a/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties b/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties index d3dab697cf..a280eaee0c 100644 --- a/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -23,12 +23,12 @@ # Install as Windows Service WindowsInstallerLink.DisplayName=Instalar como um servi\u00e7o do Windows # Slave root directory ''{0}'' doesn''t exist -WindowsSlaveInstaller.RootFsDoesntExist=Diret\u00f3rio Slave ''{0}'' n\u00e3o existe +WindowsSlaveInstaller.RootFsDoesntExist=Diret\u00f3rio slave ''{0}'' n\u00e3o existe # .NET Framework 2.0 or later is required for this feature -WindowsSlaveInstaller.DotNetRequired=.NET Framework 2.0 ou superior \u00e9 necess\u00e1rio +WindowsSlaveInstaller.DotNetRequired=Framework .NET 2.0 ou superior \u00e9 necess\u00e1rio # This will install a slave agent as a Windows service, so that a Jenkins slave starts automatically when the machine boots. WindowsSlaveInstaller.ConfirmInstallation=Isso instalar\u00e1 o agente slave como um servi\u00e7o do Windows, portanto ser\u00e1 iniciado junto com o Sistema Operacional # Installation was successful. Would you like to start the service now? WindowsSlaveInstaller.InstallationSuccessful=Instala\u00e7\u00e3o efetuada com sucesso. Gostaria de iniciar o servi\u00e7o agora? # Installs Jenkins as a Windows service to this system, so that Jenkins starts automatically when the machine boots. -WindowsInstallerLink.Description=Instala Jenkins como um servi\u00e7o do Windows, ent\u00e3o ser\u00e1 iniciado junto com o sistema operacional +WindowsInstallerLink.Description=Instala o Jenkins como um servi\u00e7o do Windows, ent\u00e3o ser\u00e1 iniciado junto com o Sistema Operacional diff --git a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart_pt_BR.properties b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart_pt_BR.properties index 049acfb1d8..0a0bd77b4d 100644 --- a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart_pt_BR.properties +++ b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,9 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Please\ wait\ while\ Jenkins\ is\ restarting= Por favor aguarde enquanto Jenkins reinicia -# You should be taken automatically to the new Jenkins in a few seconds. \ -# If for some reasons the service fails to start, check Windows event log for errors and consult \ +Please\ wait\ while\ Jenkins\ is\ restarting= Por favor aguarde enquanto o Jenkins reinicia +# You should be taken automatically to the new Jenkins in a few seconds. \ +# If for some reasons the service fails to start, check Windows event log for errors and consult \ # online wiki page. blurb=Voc\u00ea deve ser levado ao Jenkins em poucos instantes. \ Se por alguma raz\u00e3o o servi\u00e7o falhar na inicializa\u00e7\u00e3o, verifique o log de eventos \ diff --git a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/index_pt_BR.properties b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/index_pt_BR.properties index 867c58253b..9157a0aeaf 100644 --- a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/index_pt_BR.properties +++ b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/index_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -26,7 +26,7 @@ Installation\ Directory=Diret\u00f3rio de instala\u00e7\u00e3o Install\ as\ Windows\ Service=Instala como um servi\u00e7o do Windows Yes=Sim Install=Instalar -# Installing Jenkins as a Windows service allows you to start Jenkins as soon as the machine starts, and regardless of \ +# Installing Jenkins as a Windows service allows you to start Jenkins as soon as the machine starts, and regardless of \ # who is interactively using Jenkins. installBlurb=Instalando Jenkins como um servi\u00e7o do Windows permite iniciar o Jenkins junto com o Windows, independente dos usu\u00e1rios. -Installation\ Complete= Instala\u00e7\u00e3o Completa +Installation\ Complete= Instala\u00e7\u00e3o completa diff --git a/core/src/main/resources/hudson/logging/LogRecorder/configure_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorder/configure_pt_BR.properties index 14324bee0e..a3697d0992 100644 --- a/core/src/main/resources/hudson/logging/LogRecorder/configure_pt_BR.properties +++ b/core/src/main/resources/hudson/logging/LogRecorder/configure_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,9 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Log\ level= -List\ of\ loggers\ and\ the\ log\ levels\ to\ record= -Logger= -Save= -Loggers= -Name= +Log\ level=N\u00edvel de log +List\ of\ loggers\ and\ the\ log\ levels\ to\ record=Lista de loggers e n\u00edveis para gravar +Logger=logger +Save=Gravar +Loggers=Loggers +Name=Nome diff --git a/core/src/main/resources/hudson/logging/LogRecorder/delete_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorder/delete_pt_BR.properties index 025f591eba..8710d6dc1e 100644 --- a/core/src/main/resources/hudson/logging/LogRecorder/delete_pt_BR.properties +++ b/core/src/main/resources/hudson/logging/LogRecorder/delete_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,4 +21,4 @@ # THE SOFTWARE. Yes=Sim -Are\ you\ sure\ about\ deleting\ this\ log\ recorder?= +Are\ you\ sure\ about\ deleting\ this\ log\ recorder?=Deseja realmente remover o registro de log? diff --git a/core/src/main/resources/hudson/logging/LogRecorder/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorder/sidepanel_pt_BR.properties index e517e7e215..43aa345e75 100644 --- a/core/src/main/resources/hudson/logging/LogRecorder/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/logging/LogRecorder/sidepanel_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -22,5 +22,5 @@ Configure=Configurar Delete=Excluir -Back\ to\ Loggers=Voltar aos Loggers +Back\ to\ Loggers=Voltar aos loggers Log\ records=Registros de log diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/index_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/index_pt_BR.properties index f1dbbaed52..b393b93062 100644 --- a/core/src/main/resources/hudson/logging/LogRecorderManager/index_pt_BR.properties +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/index_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,8 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Name=Nome +Name=Nome All\ Jenkins\ Logs= Todos os logs do Jenkins -Log\ Recorders= Logs Gravados +Log\ Recorders= Logs gravados Add\ new\ log\ recorder= Novos registros adicionados no Log Log= Log diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt_BR.properties index 2604c153c3..bbe50273c9 100644 --- a/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,9 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -All\ Logs= Todos os Logs -New\ Log\ Recorder= Novo registro no Log +All\ Logs= Todos os logs +New\ Log\ Recorder= Novo registro no log Back\ to\ Dashboard= Voltar Manage\ Jenkins=Gerenciar Jenkins -Logger\ List= Lista de Logs -Log\ Levels= N\u00edveis de Log +Logger\ List= Lista de logs +Log\ Levels= N\u00edveis de log diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_pt_BR.properties b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_pt_BR.properties index 15cade1b58..7e421cf1c7 100644 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_pt_BR.properties +++ b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,10 +20,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Execute\ touchstone\ builds\ first= Ordenar por constru\u00e7\u00f5es +Execute\ touchstone\ builds\ first= Ordenar por builds Unstable= Inst\u00e1vel Run\ each\ configuration\ sequentially= Rodar cada configura\u00e7\u00e3o em sequ\u00eancia Stable= Est\u00e1vel Required\ result= Resultado Filter= Filtro -required.result.description=Executar as demais combina\u00e7\u00f5es somente se os crit\u00e9rios de constru\u00e7\u00e3o tiver (pelo menos) o resultado selecionado. +required.result.description=Executar as demais combina\u00e7\u00f5es somente se os crit\u00e9rios de builds tiver (pelo menos) o resultado selecionado. diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt_BR.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt_BR.properties index 5c48a1709b..31b504904a 100644 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt_BR.properties +++ b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Not\ run= Nao executar +Not\ run= N\u00e3o executar diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt_BR.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt_BR.properties index b226959dfd..8bf572dc91 100644 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt_BR.properties +++ b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt_BR.properties @@ -1,4 +1,5 @@ # This file is under the MIT License by authors +# Translated by: Fernando Boaglio -Delete\ Build=Remover este Build +Delete\ Build=Remover este build Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=Remover este build e todas as suas configura\u00E7\u00F5es diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt_BR.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt_BR.properties index 539f488478..440b136168 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt_BR.properties +++ b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,15 +20,15 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Advanced\ Project\ Options=Op\u00E7\u00F5es Avan\u00E7adas de Projeto -Configuration\ Matrix=Matriz de Configura\u00E7\u00E3o -Build\ on\ multiple\ nodes=Construir em m\u00FAltiplos nodos +Advanced\ Project\ Options=Op\u00E7\u00F5es avan\u00E7adas de projeto +Configuration\ Matrix=Matriz de configura\u00E7\u00E3o +Build\ on\ multiple\ nodes=Construir em m\u00FAltiplos n\u00f3s Node=N\u00f3 Name=Nome Use\ custom\ workspace=Usar workspace customizado Values=Valor Add\ more\ axis=Adicionar mais eixos -Delete=ApagarAxes= Deletar eixos +Delete=ApagarAxes= Remover eixos Labels= R\u00f3tulo Directory=Pasta Directory\ for\ sub-builds=Pasta para sub-builds diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_pt_BR.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_pt_BR.properties index a7c444e763..6c29f4ca51 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_pt_BR.properties +++ b/core/src/main/resources/hudson/matrix/MatrixProject/index_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Disable\ Project=Desabilitar Projeto +Disable\ Project=Desabilitar projeto Latest\ Test\ Result=\u00DAltimo resultado do teste Project=Projeto diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt_BR.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt_BR.properties index 94ee875518..cb3bfd5bc9 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt_BR.properties +++ b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -body=Apropriado para projetos que necessitam de grande n\u00FAmero de diferentes configura\u00E7\u00F5es, como teste em m\u00FAltiplos ambientes, constru\u00E7\u00E3o para plataformas espec\u00EDficas, etc. +body=Apropriado para projetos que necessitam de grande n\u00famero de diferentes configura\u00e7\u00f5es, como teste em m\u00faltiplos ambientes, builds para plataformas espec\u00edficas, etc. diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractBuild/index_pt_BR.properties index 1adbd7d62b..531ae4bc62 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractBuild/index_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,15 +21,15 @@ # THE SOFTWARE. startedAgo=Iniciado {0} atr\u00e1s -Build\ Artifacts=Artefatos da constru\u00E7\u00E3o +Build\ Artifacts=Artefatos da builds Changes\ in\ dependency=Mudan\u00E7as na depend\u00EAncia -beingExecuted=Tempo de execu\u00E7\u00E3o da constru\u00E7\u00E3o {0} +beingExecuted=Tempo de execu\u00E7\u00E3o da builds {0} detail=detalhe Not\ yet\ determined=Ainda n\u00e3o determinado Failed\ to\ determine=Falhou ao determinar log=log -Upstream\ Builds=Constru\u00E7\u00F5es Pai -Downstream\ Builds=Contru\u00e7\u00f5es Filho +Upstream\ Builds=builds pai +Downstream\ Builds=builds filho none=nenhum Took=Demorou on=no slave diff --git a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_pt_BR.properties index 7811da01d6..2bc30ff0a8 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Previous\ Build=Constru\u00E7\u00E3o Anterior -Next\ Build=Pr\u00F3ximo Build +Previous\ Build=Build anterior +Next\ Build=Pr\u00F3ximo build diff --git a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_pt_PT.properties b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_pt_PT.properties index dadf9b07bc..70b25b6c11 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_pt_PT.properties +++ b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_pt_PT.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Next\ Build=Pr\u00F3xima constru\u00E7\u00E3o +Next\ Build=Pr\u00F3xima builds Previous\ Build=Prever/ver contru\u00E7\u00E3o diff --git a/core/src/main/resources/hudson/model/AbstractBuild/tasks_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractBuild/tasks_pt_BR.properties index a5e30827f7..b7faf4501b 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/tasks_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractBuild/tasks_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,9 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Back\ to\ Project=Voltar ao Projeto +Back\ to\ Project=Voltar ao projeto Changes=Altera\u00E7\u00F5es -Console\ Output=Sa\u00EDda do Console +Console\ Output=Sa\u00EDda do console View\ as\ plain\ text=Visualizar como texto Edit\ Build\ Information=Editar informa\u00E7\u00F5es de compila\u00E7\u00E3o Status=Estado pessoal @@ -71,5 +71,5 @@ Plugins Servlet Container Notes This page is the landing page for the translation assistance plugin''s "contribute" link When you check the "I contribute my translations to the Jenkins project" link, you acknowledge that your submission will be licensed under the MIT license (the same license that the rest of the Jenkins core uses) and you have the rights to release them under the said license. -View\ Build\ Information=Ver informa\u00E7\u00F5es de constru\u00E7\u00E3o +View\ Build\ Information=Ver informa\u00E7\u00F5es de builds raw=sem formata\u00e7\u00e3o diff --git a/core/src/main/resources/hudson/model/AbstractItem/configure-common_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractItem/configure-common_pt_BR.properties index 6f61d6e012..2014db32d8 100644 --- a/core/src/main/resources/hudson/model/AbstractItem/configure-common_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractItem/configure-common_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,10 +20,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Advanced\ Project\ Options=Op\u00E7\u00F5es Avan\u00E7adas do Projeto +Advanced\ Project\ Options=Op\u00E7\u00F5es avan\u00E7adas do projeto # (Default) default.value=Default Node=N\u00F3 -Tie\ this\ project\ to\ a\ node=Vincular esse projeto a um N\u00F3 -Display\ Name=Nome de Exibi\u00E7\u00E3o +Tie\ this\ project\ to\ a\ node=Vincular esse projeto a um n\u00F3 +Display\ Name=Nome de exibi\u00E7\u00E3o JDK\ to\ be\ used\ for\ this\ project=Necess\u00E1rio usar JDK nesse projeto diff --git a/core/src/main/resources/hudson/model/AbstractItem/delete_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractItem/delete_pt_BR.properties index 9088a770d4..8bbd6ad528 100644 --- a/core/src/main/resources/hudson/model/AbstractItem/delete_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractItem/delete_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Are\ you\ sure\ about\ deleting\ the\ job?=Tem certeza que deseja excluir a tarefa? +Are\ you\ sure\ about\ deleting\ the\ job?=Tem certeza que deseja excluir esse job? Yes=Sim -blurb=Tem certeza que deseja excluir o +blurb=Tem certeza que deseja excluir o job diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties index e5456c59f6..7a1af197ca 100644 --- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,13 +21,13 @@ # THE SOFTWARE. Error\:\ no\ workspace=Erro: nenhum workspace -The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=O projeto foi renomeado recentemente e nenhuma constru\u00e7\u00e3o foi feita com um novo nome. +The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=O projeto foi renomeado recentemente e nenhum build foi feito com um novo nome. The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=A m\u00e1quina slave onde esse projeto executou pela ultima vez foi removida. li3=O diret\u00f3rio de workspace ({0}) foi removido externamente ao Jenkins. -text=Execute uma constru\u00e7\u00e3o para que o Jenkins crie um workspace. -There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=N\u00e3o existe workspace dispon\u00edvel para esse projeto +text=Execute um build para que o Jenkins crie um workspace. +There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=N\u00e3o existe nenhum workspace dispon\u00edvel para esse projeto A\ project\ won''t\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=Um projeto n\u00e3o tem nenhum workspace at\u00e9 que \ -pelo menos uma constru\u00e7\u00e3o seja executada. +pelo menos um build seja constru\u00eddo. A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=Um projeto n\u00e3o tem nenhum workspace at\u00e9 que \ -pelo menos uma constru\u00e7\u00e3o seja executada. +pelo menos um build seja constru\u00eddo. There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=N\u00e3o existe nenhum workspace para esse projeto. As poss\u00edveis raz\u00f5es s\u00e3o: diff --git a/core/src/main/resources/hudson/model/AbstractProject/main_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractProject/main_pt_BR.properties index 2030ff769a..3345a18b75 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/main_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/main_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Workspace=\u00C1rea de Trabalho +Workspace=Workspace Last\ Successful\ Artifacts=\u00DAltimos artefatos que obtiveram sucesso -Recent\ Changes=Mudan\u00e7as Recentes -Latest\ Test\ Result=\u00daltimo Resultado de Teste +Recent\ Changes=Mudan\u00e7as recentes +Latest\ Test\ Result=\u00daltimo resultado de teste diff --git a/core/src/main/resources/hudson/model/AbstractProject/makeDisabled_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractProject/makeDisabled_pt_BR.properties index 7d50b9a3ce..63a0f3bc8f 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/makeDisabled_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/makeDisabled_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Disable\ Project=Desabilitar Projeto +Disable\ Project=Desabilitar projeto Enable=Habilitar This\ project\ is\ currently\ disabled=Este projeto est\u00e1 atualmente desabilitado. diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_pt_BR.properties index 8ecb4b978a..5f5c8076a2 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,12 +21,12 @@ # THE SOFTWARE. Back\ to\ Dashboard=Voltar para o Dashboard -Status=Situa\u00E7\u00E3o -Build\ scheduled=Constru\u00E7\u00E3o Agendada -Changes=Altera\u00E7\u00F5es -Wipe\ Out\ Workspace=Limpar \u00C1rea de Trabalho +Status=Situa\u00e7\u00e3o +Build\ scheduled=build agendada +Changes=Altera\u00e7\u00f5es +Wipe\ Out\ Workspace=Limpar workspace delete=Excluir {0} Configure=Configurar -View\ Configuration= Configurar a View -delete.confirm=Quer mesmo deletar {0} \u2018{1}\u2019? -wipe.out.confirm=Tem certeza que quer apagar o espa\u00E7o de trabalho? +View\ Configuration= Configurar a view +delete.confirm=Quer mesmo remover {0} '{1}'? +wipe.out.confirm=Tem certeza que quer remover o workspace? diff --git a/core/src/main/resources/hudson/model/AbstractProject/svn-password_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractProject/svn-password_pt_BR.properties index 633ddd3cbd..113a4ba53f 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/svn-password_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/svn-password_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ # Logon to the server that runs Jenkins, by using the same user account Jenkins uses. step.1=Logar nesse servidor usando o mesmo usu\u00e1rio e senha do Jenkins # Note that this approach still doesn''t really make your password secure, it just makes it a bit harder to read. -final.words=Essa aproxima\u00e7\u00e3o nao fez a sua senha segura, apenas a deixou um pouco mais dificil de decifrar +final.words=Essa aproxima\u00e7\u00e3o nao fez a sua senha segura, apenas a deixou um pouco mais complicado de decifrar # People can read your password by using pargs. reason.1=Pessoas podem ler as senhas usando pargs # Subversion asks you the password interactively. Type in the password. @@ -32,9 +32,9 @@ step.3=Subversion pede sua senha de forma interativa. Digite no campo password. step.2=Executar manualmente svn co ... How\ to\ set\ Subversion\ password?=Como trocar a senha do Subversion? # Password will be stored in a clear text in Jenkins. -reason.2=Senha sera armazenada num campo de texto do Jenkins +reason.2=Senha ser\u00e1 armazenada num campo de texto do Jenkins # While subversion allows you to specify the ''--password'' option explicitly in the command line, this is generally not desirable when you are using Jenkins, because: -explanation.introduction=Enquanto Subversion permite especificar a opcao '--password'' explicitamente, na linha de comando, esse modo nao eh desej\u00e1vel no Jenkins. +explanation.introduction=Enquanto Subversion permite especificar a op\u00e7\u00e3o '--password'' explicitamente, na linha de comando, esse modo n\u00e3o \u00e9 desej\u00e1vel no Jenkins. # A preferable approach is to do the following steps: alternative.introduction=Uma abordagem prefer\u00edvel seria realizar os seguintes passos: # Subversion stores it in its authentication cache, and for successive svn co ... it will use the password stored in the cache. diff --git a/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspaceBlocked_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspaceBlocked_pt_BR.properties index 2f8f2128a3..b9d606fb96 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspaceBlocked_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspaceBlocked_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,5 +21,5 @@ # THE SOFTWARE. Error\:\ Wipe\ Out\ Workspace\ blocked\ by\ SCM=workspace bloqueado por SCM -The\ SCM\ for\ this\ project\ has\ blocked\ this\ attempt\ to\ wipe\ out\ the\ project''s\ workspace.=SCM bloqueou a exclusao desse workspace -The\ SCM\ for\ this\ project\ has\ blocked\ this\ attempt\ to\ wipe\ out\ the\ project's\ workspace.=SCM bloqueou a exclusao desse workspace +The\ SCM\ for\ this\ project\ has\ blocked\ this\ attempt\ to\ wipe\ out\ the\ project''s\ workspace.=SCM bloqueou a exclus\u00e3o desse workspace +The\ SCM\ for\ this\ project\ has\ blocked\ this\ attempt\ to\ wipe\ out\ the\ project's\ workspace.=SCM bloqueou a exclus\u00e3o desse workspace diff --git a/core/src/main/resources/hudson/model/AllView/newViewDetail_pt_BR.properties b/core/src/main/resources/hudson/model/AllView/newViewDetail_pt_BR.properties index bd6dde64cb..0eb51f2998 100644 --- a/core/src/main/resources/hudson/model/AllView/newViewDetail_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AllView/newViewDetail_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -# This view shows all the jobs on Jenkins. -blurb=Essa View mostra todos os jobs do Jenkins +# This view shows all the jobs on Jenkins. +blurb=Essa view mostra todos os jobs do Jenkins diff --git a/core/src/main/resources/hudson/model/AllView/noJob_pt_BR.properties b/core/src/main/resources/hudson/model/AllView/noJob_pt_BR.properties index 7efbeda624..b892fa07f5 100644 --- a/core/src/main/resources/hudson/model/AllView/noJob_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AllView/noJob_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -newJob=Por favor clique em: Novo Job para iniciar. -login=Efetue login para criar novas tarefas. +newJob=Por favor clique em: Novo job para iniciar. +login=Efetue login para criar novas jobs. signup=Se voc\u00ea ainda n\u00e3o tem uma conta, voc\u00ea pode criar uma conta agora. Welcome\ to\ Jenkins!=Bem-vindo ao Jenkins! diff --git a/core/src/main/resources/hudson/model/BooleanParameterDefinition/config_pt_BR.properties b/core/src/main/resources/hudson/model/BooleanParameterDefinition/config_pt_BR.properties index 6beb69a886..b98a4b4821 100644 --- a/core/src/main/resources/hudson/model/BooleanParameterDefinition/config_pt_BR.properties +++ b/core/src/main/resources/hudson/model/BooleanParameterDefinition/config_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,5 +21,5 @@ # THE SOFTWARE. Name=Nome -Default\ Value=Valor Padr\u00e3o +Default\ Value=Valor padr\u00e3o Description=Descri\u00e7\u00e3o diff --git a/core/src/main/resources/hudson/model/BuildAuthorizationToken/config_pt_BR.properties b/core/src/main/resources/hudson/model/BuildAuthorizationToken/config_pt_BR.properties index 9ffd94aed5..8405f28037 100644 --- a/core/src/main/resources/hudson/model/BuildAuthorizationToken/config_pt_BR.properties +++ b/core/src/main/resources/hudson/model/BuildAuthorizationToken/config_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,9 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Use\ the\ following\ URL\ to\ trigger\ build\ remotely\:=Use a seguinte URL pra iniciar uma constru\u00e7\u00e3o remota: +Use\ the\ following\ URL\ to\ trigger\ build\ remotely\:=Use a seguinte URL para iniciar um build remoto: Authentication\ Token=Autentica\u00e7\u00e3o Optionally\ append\ &cause\=Cause+Text\ to\ provide\ text\ that\ will\ be\ included\ in\ the\ recorded\ build\ cause.=Opcionalmente anexe \ -&cause\=Cause+Text para fornecer o texto que ser\u00e1 inclu\u00eddo na constru\u00e7\u00e3o gravada -Trigger\ builds\ remotely=Dispare constru\u00e7\u00f5es remotamente -e.g.,\ from\ scripts=exemplo, a partir dos scripts +&cause\=Cause+Text para fornecer o texto que ser\u00e1 inclu\u00eddo no build gravado +Trigger\ builds\ remotely=Dispare builds remotamente +e.g.,\ from\ scripts=exemplo, a partir dos scripts diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pt_BR.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pt_BR.properties index 031c7a84e0..6a45a43d52 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -22,4 +22,4 @@ # Started by upstream project {0} build number {1} caused_by=Criado por originalidade de: -started_by_project=Iniciado pela constru\u00E7\u00E3o {1} do projeto {0} +started_by_project=Iniciado pelo build {1} do projeto {0} diff --git a/core/src/main/resources/hudson/model/Computer/_script_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/_script_pt_BR.properties index d1c836aa1a..76ece934fa 100644 --- a/core/src/main/resources/hudson/model/Computer/_script_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Computer/_script_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -This\ execution\ happens\ in\ the\ slave\ agent\ JVM.=A execu\u00e7\u00e3o aconteceu no agente JVM Slave. +This\ execution\ happens\ in\ the\ slave\ agent\ JVM.=A execu\u00e7\u00e3o aconteceu no agente JVM slave. diff --git a/core/src/main/resources/hudson/model/Computer/delete_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/delete_pt_BR.properties index 56c6bc7fd7..d3a3105c4a 100644 --- a/core/src/main/resources/hudson/model/Computer/delete_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Computer/delete_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,4 +21,4 @@ # THE SOFTWARE. Yes=Sim -Are\ you\ sure\ about\ deleting\ the\ slave?=Tem certeza que quer deletar esse Slave? +Are\ you\ sure\ about\ deleting\ the\ slave?=Tem certeza que deseja remover esse slave? diff --git a/core/src/main/resources/hudson/model/Computer/index_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/index_pt_BR.properties index 7a82fdb5b7..bece322620 100644 --- a/core/src/main/resources/hudson/model/Computer/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Computer/index_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,8 +21,8 @@ # THE SOFTWARE. # This node has an availability policy that will "{0}". Currently, this mandates that the node be off-line. -title.no_manual_launch=Esse NO tem uma politica de disponibilidade "{0}". Normalmente, o padrao eh ficar off-line. -Labels\:=Rotulo +title.no_manual_launch=Esse n\u00f3 tem uma pol\u00edtica de disponibilidade "{0}". Normalmente, o padr\u00e3o eh ficar off-line. +Labels\:=R\u00f3tulo # This node is back online submit.temporarilyOffline=Esse n\u00f3 voltou a ficar online None=Nenhum diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_pt_BR.properties index 5e15451b31..9dc1ac5bda 100644 --- a/core/src/main/resources/hudson/model/Computer/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Computer/sidepanel_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,10 +20,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Back\ to\ List=Voltar para a Lista -Build\ History=Hist\u00F3rico de Build\u00B4s +Back\ to\ List=Voltar para a lista +Build\ History=Hist\u00f3rico de builds Configure=Configurar -Status=Situa\u00E7\u00E3o -Delete\ Slave=Remover Slave -Load\ Statistics=Carregar Estat\u00edsticas -Script\ Console=Terminal de Script +Status=Situa\u00e7\u00e3o +Delete\ Slave=Remover slave +Load\ Statistics=Carregar estat\u00edsticas +Script\ Console=Terminal de script diff --git a/core/src/main/resources/hudson/model/ComputerSet/_new_pt_BR.properties b/core/src/main/resources/hudson/model/ComputerSet/_new_pt_BR.properties index f4e4fb8839..7531672907 100644 --- a/core/src/main/resources/hudson/model/ComputerSet/_new_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ComputerSet/_new_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,5 +21,5 @@ # THE SOFTWARE. Save=Salvar -Name\ is\ mandatory=Nome \u00e9 obrigat\u00f3rio +Name\ is\ mandatory=O nome \u00e9 obrigat\u00f3rio Name=Nome diff --git a/core/src/main/resources/hudson/model/ComputerSet/configure_pt_BR.properties b/core/src/main/resources/hudson/model/ComputerSet/configure_pt_BR.properties index 01ebb8e53d..f57f13652d 100644 --- a/core/src/main/resources/hudson/model/ComputerSet/configure_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ComputerSet/configure_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Preventive\ Node\ Monitoring=Monitora\u00e7\u00e3o preventiva dos N\u00f3s -Node\ Monitoring\ Configuration=Configura\u00e7\u00e3o da monitora\u00e7\u00e3o dos N\u00f3s +Preventive\ Node\ Monitoring=Monitora\u00e7\u00e3o preventiva dos n\u00f3s +Node\ Monitoring\ Configuration=Configura\u00e7\u00e3o da monitora\u00e7\u00e3o dos n\u00f3s diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_pt_BR.properties index a1a539a9f2..faa5701bee 100644 --- a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Back\ to\ Dashboard=Voltar ao Painel Principal +Back\ to\ Dashboard=Voltar ao painel principal Manage\ Jenkins=Gerenciar Jenkins Configure=Configurar New\ Node=Novo n\u00f3 diff --git a/core/src/main/resources/hudson/model/Executor/causeOfDeath_pt_BR.properties b/core/src/main/resources/hudson/model/Executor/causeOfDeath_pt_BR.properties index ca77330af1..bf22a97faa 100644 --- a/core/src/main/resources/hudson/model/Executor/causeOfDeath_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Executor/causeOfDeath_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -more\ info=Maiores informacoes -Thread\ has\ died=Discuss\u00e3o encerrada +more\ info=Mais informa\u00e7\u00f5es +Thread\ has\ died=Thread encerrada Back=Volta -Thread\ is\ still\ alive=Discuss\u00e3o continua ativa +Thread\ is\ still\ alive=A thread continua ativa diff --git a/core/src/main/resources/hudson/model/Fingerprint/index_pt_BR.properties b/core/src/main/resources/hudson/model/Fingerprint/index_pt_BR.properties index 5a7c4a5407..b445f73cd2 100644 --- a/core/src/main/resources/hudson/model/Fingerprint/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Fingerprint/index_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -introduced=Introduzido {0} atras +introduced=Introduzido {0} outside\ Jenkins=Fora do Jenkins This\ file\ has\ not\ been\ used\ anywhere\ else.=Este arquivo n\u00e3o foi usado em nenhum lugar. This\ file\ has\ been\ used\ in\ the\ following\ places=Este arquivo foi usado nos seguintes lugares diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pt_BR.properties b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pt_BR.properties index e6c2344c79..c02b59dfae 100644 --- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pt_BR.properties +++ b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -body=Esta \u00E9 a central de funcionalidades do Jenkins. Jenkins construir\u00E1 seu projeto, voc\u00EA pode combinar qualquer SCM com qualquer sistema de constru\u00E7\u00E3o, e at\u00E9 mesmo ser usado para outras tarefas diferentes de constru\u00E7\u00E3o de software. +body=Esta \u00e9 a central de funcionalidades do Jenkins. Ele construir\u00e1 seu projeto,e voc\u00ea pode combinar qualquer SCM com qualquer sistema de builds, e ele at\u00e9 mesmo pode ser usado para outras jobs diferentes de builds de software. diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_pt_BR.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_pt_BR.properties index 41c1ddf26d..ef2264a837 100644 --- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,9 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -title={0} Tend\u00eancia de tempo de constru\u00e7\u00e3o +title={0} Tend\u00eancia de tempo de builds Duration=Dura\u00e7\u00e3o -Slave=Slave -More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=Mais do que uma constru\u00e7\u00e3o \u00e9 necess\u00e1ria para o relat\u00f3rio de tend\u00eancia. -Build\ Time\ Trend=Trend de Build +Slave=SlaveMore\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=\u00c9 necess\u00e1rio mais do que um build para criar o relat\u00f3rio de tend\u00eancia. +Build\ Time\ Trend=Tend\u00eancia de tempo de Build Timeline=Linha do tempo diff --git a/core/src/main/resources/hudson/model/Job/configure_pt_BR.properties b/core/src/main/resources/hudson/model/Job/configure_pt_BR.properties index 670c304808..32d486e561 100644 --- a/core/src/main/resources/hudson/model/Job/configure_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Job/configure_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -23,6 +23,6 @@ Strategy=Estrat\u00E9gia name=Nome do {0} Description=Descri\u00e7\u00e3o -Discard\ Old\ Builds=Descartar Constru\u00e7\u00f5es Antigas +Discard\ Old\ Builds=Descartar builds antigos Save=Salvar LOADING=CARREGANDO diff --git a/core/src/main/resources/hudson/model/Job/index_pt_BR.properties b/core/src/main/resources/hudson/model/Job/index_pt_BR.properties index 480aef1000..f3b0483dfb 100644 --- a/core/src/main/resources/hudson/model/Job/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Job/index_pt_BR.properties @@ -1,5 +1,5 @@ -# This file is under the MIT License by authors +# This file is under the MIT License by authors, Fernando Boaglio Disable\ Project=Desabilitar projeto Enable=Habilitar -Project\ name=Nome do Projeto +Project\ name=Nome do projeto diff --git a/core/src/main/resources/hudson/model/Job/rename_pt_BR.properties b/core/src/main/resources/hudson/model/Job/rename_pt_BR.properties index c6a59768fa..85a3ad7fbe 100644 --- a/core/src/main/resources/hudson/model/Job/rename_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Job/rename_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,13 +21,13 @@ # THE SOFTWARE. # Unable to rename a job while it is building. -noRenameWhileBuilding=N\u00e3o \u00e9 poss\u00edvel renomear enquanto o job esta sendo construido +noRenameWhileBuilding=N\u00e3o \u00e9 poss\u00edvel renomear enquanto o job est\u00e1 em constru\u00e7\u00e3o # Yes Yes=Sim # No No=N\u00e3o # All other configuration options were saved. -configWasSaved=Todas as outras op\u00e7\u00f5es de configura\u00e7\u00e3o foram salvas +configWasSaved=Todas as outras op\u00e7\u00f5es de configura\u00e7\u00e3o foram salvas # Are you sure about renaming {0} to {1}? description=Tem certeza que quer renomear {0} para {1}? # The name {0} is already in use. diff --git a/core/src/main/resources/hudson/model/Label/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/Label/sidepanel_pt_BR.properties index 9bd5177ffa..d0c8985aba 100644 --- a/core/src/main/resources/hudson/model/Label/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Label/sidepanel_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,5 +21,5 @@ # THE SOFTWARE. Back\ to\ Dashboard=Voltar ao Dashboard -Overview={0}Vis\u00e3o Geral -Load\ Statistics=Carregar Estat\u00edsticas +Overview={0}Vis\u00e3o geral +Load\ Statistics=Carregar estat\u00edsticas diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries_pt_BR.properties b/core/src/main/resources/hudson/model/ListView/configure-entries_pt_BR.properties index 3c6b56cb9d..0f25167d79 100644 --- a/core/src/main/resources/hudson/model/ListView/configure-entries_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ListView/configure-entries_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,15 +20,15 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Jobs=Tarefas -All\ selected\ jobs=Todas as tarefas selecionadas +Jobs=Jobs +All\ selected\ jobs=Todas as jobs selecionadas Status\ Filter=Status do filtro -Use\ a\ regular\ expression\ to\ include\ jobs\ into\ the\ view=Use uma express\u00e3o regular para incluir tarefas na View +Use\ a\ regular\ expression\ to\ include\ jobs\ into\ the\ view=Use uma express\u00e3o regular para incluir jobs na view Recurse\ in\ subfolders=Recursivo nos sub-diret\u00F3rios Regular\ expression=Express\u00e3o regular Columns=Colunas Add\ column=Adicionar coluna -Job\ Filters=Filtrar tarefas -Add\ Job\ Filter=Adicionar filtro de tarefa -Disabled\ jobs\ only=Desabilitar tarefas -Enabled\ jobs\ only=Habilitar tarefas +Job\ Filters=Filtrar jobs +Add\ Job\ Filter=Adicionar filtro de job +Disabled\ jobs\ only=Desabilitar jobs +Enabled\ jobs\ only=Habilitar jobs diff --git a/core/src/main/resources/hudson/model/ListView/newViewDetail_pt_BR.properties b/core/src/main/resources/hudson/model/ListView/newViewDetail_pt_BR.properties index a5bafdc8e9..79ba337b75 100644 --- a/core/src/main/resources/hudson/model/ListView/newViewDetail_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ListView/newViewDetail_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -22,5 +22,5 @@ # \ # Shows jobs in a simple list format. You can choose which jobs are to be displayed in which view. -blurb=Mostrar as tarefas em uma lista simples. Voc\u00EA pode escolher quais trabalhos ser\u00E3o listados. +blurb=Mostrar as jobs em uma lista simples. Voc\u00EA pode escolher quais trabalhos ser\u00E3o listados. #Shows jobs in a simple list format. You can choose which jobs are to be displayed in which view. diff --git a/core/src/main/resources/hudson/model/LoadStatistics/main_pt_BR.properties b/core/src/main/resources/hudson/model/LoadStatistics/main_pt_BR.properties index 8061f79ab6..8841682f08 100644 --- a/core/src/main/resources/hudson/model/LoadStatistics/main_pt_BR.properties +++ b/core/src/main/resources/hudson/model/LoadStatistics/main_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -55,6 +55,6 @@ Timespan=Intervalo # \ # The graph is exponential moving average of periodically collected data values. \ # 3 timespans are updated every 10 seconds, 1 minute, and 1 hour respectively. -blurb= As estat\u00EDsticas carregadas rastreiam tr\u00EAs m\u00E9tricas de utiliza\u00E7\u00E3o de recursos:
    N\u00FAmero total de de executores
    Para um computador, este \u00E9 o n\u00FAmero de executores que o computador tem. Para um r\u00F3tulo, esta \u00E9 a soma de todos os executores entre todos os computadores neste r\u00F3tulo. Para todo o Jenkins, esta \u00E9 a soma de todos os executores entre todos os computadores que utilizam o Jenkins. Al\u00E9m das altera\u00E7\u00F5es na configura\u00E7\u00E3o, este valor tamb\u00E9m pode mudar quando um "escravo" fica indispon\u00EDvel.
    N\u00FAmero de executores ocupados
    Esta linha rastreia o n\u00FAmero de executores (entre todos os executores contados anteriormente) que est\u00E3o construindo. A rela\u00E7\u00E3o deste com o n\u00FAmero total de executores possibilita conhecer a utiliza\u00E7\u00E3o do recurso. Se todos os seus executores est\u00E3o ocupados por um longo per\u00EDodo de tempo, considere adicionar mais computadores ao "cluster" do Jenkins.
    Comprimento da fila
    Este \u00E9 o n\u00FAmero de trabalhos que est\u00E3o na fila de constru\u00E7\u00E3o, esperando por um executor dispon\u00EDvel (do computador, com r\u00F3tulo, ou do pr\u00F3prio Jenkins, respectivamente). Isto n\u00E3o inclui trabalhos que est\u00E3o em per\u00EDodo de espera, nem inclui trabalhos que est\u00E3o na fila devido a constru\u00E7\u00F5es prematuras est\u00E3o em progresso. Se esta linha nunca passa de zero, significa que o Jenkins realizar\u00E1 mais constru\u00E7\u00F5es adicionando mais computadores.
    O gr\u00E1fico \u00E9 a m\u00E9dia de movimenta\u00E7\u00E3o exponencial de dados coletados periodicamente. 3 per\u00EDodos s\u00E3o atualizados a cada 10 segundos, 1 minuto, e 1 hora respectivamente. +blurb= As estat\u00EDsticas carregadas rastreiam tr\u00EAs m\u00E9tricas de utiliza\u00E7\u00E3o de recursos:
    N\u00FAmero total de de executores
    Para um computador, este \u00E9 o n\u00FAmero de executores que o computador tem. Para um r\u00F3tulo, esta \u00E9 a soma de todos os executores entre todos os computadores neste r\u00F3tulo. Para todo o Jenkins, esta \u00E9 a soma de todos os executores entre todos os computadores que utilizam o Jenkins. Al\u00E9m das altera\u00E7\u00F5es na configura\u00E7\u00E3o, este valor tamb\u00E9m pode mudar quando um "slave" fica indispon\u00EDvel.
    N\u00FAmero de executores ocupados
    Esta linha rastreia o n\u00FAmero de executores (entre todos os executores contados anteriormente) que est\u00E3o construindo. A rela\u00E7\u00E3o deste com o n\u00FAmero total de executores possibilita conhecer a utiliza\u00E7\u00E3o do recurso. Se todos os seus executores est\u00E3o ocupados por um longo per\u00EDodo de tempo, considere adicionar mais computadores ao "cluster" do Jenkins.
    Comprimento da fila
    Este \u00E9 o n\u00FAmero de trabalhos que est\u00E3o na fila de builds, esperando por um executor dispon\u00EDvel (do computador, com r\u00F3tulo, ou do pr\u00F3prio Jenkins, respectivamente). Isto n\u00E3o inclui trabalhos que est\u00E3o em per\u00EDodo de espera, nem inclui trabalhos que est\u00E3o na fila devido o builds prematuras est\u00E3o em progresso. Se esta linha nunca passa de zero, significa que o Jenkins realizar\u00E1 mais builds adicionando mais computadores.
    O gr\u00E1fico \u00E9 a m\u00E9dia de movimenta\u00E7\u00E3o exponencial de dados coletados periodicamente. 3 per\u00EDodos s\u00E3o atualizados a cada 10 segundos, 1 minuto, e 1 hora respectivamente. # Estes usu\u00E1rios podem se logar no Jenkins. Este \u00E9 um super conjunto desta lista, \ Long=Longo diff --git a/core/src/main/resources/hudson/model/Messages_pt_BR.properties b/core/src/main/resources/hudson/model/Messages_pt_BR.properties index 9aedb695dd..309d15c4c2 100644 --- a/core/src/main/resources/hudson/model/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Messages_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -25,8 +25,8 @@ AbstractBuild.KeptBecause=mantido por causa de {0} AbstractProject.Pronoun=Projeto AbstractProject.Aborted=Abortado -AbstractProject.BuildInProgress=A constru\u00e7\u00e3o #{0} j\u00e1 est\u00e1 em progresso{1} -AbstractProject.Disabled=Constru\u00e7\u00e3o desabilitada +AbstractProject.BuildInProgress=A builds #{0} j\u00e1 est\u00e1 em progresso{1} +AbstractProject.Disabled=builds desabilitada AbstractProject.ETA=\ (ETA:{0}) AbstractProject.NoSCM=Nenhum SCM AbstractProject.NoWorkspace=Nenhum workspace est\u00e1 dispon\u00edvel, assim n\u00e3o pode checar por atualiza\u00e7\u00f5es. @@ -35,7 +35,7 @@ AbstractProject.ScmAborted=Check out SCM abortada AbstractProject.WorkspaceOffline=O workspace est\u00e1 offline. Api.MultipleMatch=XPath "{0}" corresponde a {1} n\u00f3s. \ - Crie um XPath que apenas corresponda a um, ou use o par\u00e2metro de pesquisa "agrupador" para agrupa-los sob um elemento raiz. + Crie um XPath que apenas corresponda a um, ou use o par\u00e2metro de pesquisa "agrupador" para agrupa-los sob um elemento raiz. Api.NoXPathMatch=XPath {0} n\u00e3o tem correspondente BallColor.Aborted=Abortado @@ -50,8 +50,8 @@ Computer.Caption=Slave {0} Executor.NotAvailable=N/D -ExternalJob.DisplayName=Monitorar uma tarefa externa -ExternalJob.Pronoun=Tarefa +ExternalJob.DisplayName=Monitorar uma job externa +ExternalJob.Pronoun=Job FreeStyleProject.DisplayName=Construir um projeto de software free-style @@ -60,61 +60,61 @@ Hudson.Computer.Caption=Master Hudson.Computer.DisplayName=master Hudson.ControlCodeNotAllowed=Nenhum c\u00f3digo de controle e permitido: {0} Hudson.DisplayName=Jenkins -Hudson.JobAlreadyExists=Uma tarefa j\u00e1 existe com o nome ''{0}'' +Hudson.JobAlreadyExists=Uma job j\u00e1 existe com o nome ''{0}'' Hudson.NoJavaInPath=Java n\u00e3o esta em seu PATH. Talvez voce precise configurar as JDKs? Hudson.NoName=Nenhum nome foi especificado Hudson.NoSuchDirectory=Tal diret\u00f3rio n\u00e3o existe: {0} Hudson.NotADirectory={0} n\u00e3o \u00e9 um diret\u00f3rio Hudson.NotAPlugin={0} n\u00e3o eh um plugin Jenkins -Hudson.NotJDKDir={0} n\u00e3o parece um diretorio JDK +Hudson.NotJDKDir={0} n\u00e3o parece um diret\u00f3rio JDK Hudson.Permissions.Title=Total Hudson.UnsafeChar=''{0}'' n\u00e3o \u00e9 um caracter seguro Hudson.ViewName=Tudo -Item.Permissions.Title=Tarefa +Item.Permissions.Title=Job -Job.AllRecentBuildFailed=Todas as constru\u00e7\u00f5es recentes falharam. -Job.BuildStability=Estabilidade de constru\u00e7\u00e3o: {0} -Job.NOfMFailed={0} das ultimas {1} constru\u00e7\u00f5es falharam. -Job.NoRecentBuildFailed=Nenhuma constru\u00e7\u00e3o recente falhou. +Job.AllRecentBuildFailed=Todas os builds recentes falharam. +Job.BuildStability=Estabilidade de builds: {0} +Job.NOfMFailed={0} das ultimas {1} builds falharam. +Job.NoRecentBuildFailed=Nenhuma builds recente falhou. Job.Pronoun=Projeto Job.minutes=minutos Queue.BlockedBy=Bloqueado por {0} -Queue.InProgress=Uma constru\u00e7\u00e3o j\u00e1 esta em progresso -Queue.InQuietPeriod=Em periodo de silencio. Expira em {0} +Queue.InProgress=Uma builds j\u00e1 esta em progresso +Queue.InQuietPeriod=Em per\u00edodo de sil\u00eancio. Expira em {0} Queue.Unknown=??? -Run.BuildAborted=constru\u00e7\u00e3o foi abortada +Run.BuildAborted=build foi abortado Run.MarkedExplicitly=Explicitamente marcada para manter o registro Run.Permissions.Title=Executar -Run.UnableToDelete=Incapaz de excluir {0}: {1} +Run.UnableToDelete=N\u00e3o foi poss\u00edvel excluir {0}: {1} Slave.InvalidConfig.Executors=Configura\u00e7\u00e3o de slave inv\u00e1lida para {0}. Inv\u00e1lido # de executores. -Slave.InvalidConfig.NoName=Configura\u00e7\u00e3o de slave inv\u00e1lida. O nome esta vazio +Slave.InvalidConfig.NoName=Configura\u00e7\u00e3o de slave inv\u00e1lida. O nome est\u00e1 vazio Slave.InvalidConfig.NoRemoteDir=Configura\u00e7\u00e3o de slave inv\u00e1lida para {0}. Nenhum diret\u00f3rio remoto foi informado Slave.Launching={0} Iniciando agente slave Slave.Terminated={0} Agente slave foi encerrado -Slave.UnableToLaunch=Incapaz de iniciar o agente slave para {0}{1} -Slave.UnixSlave=Este eh um slave Unix -Slave.WindowsSlave=Este eh um slave Windows +Slave.UnableToLaunch=N\u00e3o foi poss\u00edvel iniciar o agente slave para {0}{1} +Slave.UnixSlave=Este \u00e9 um slave Unix +Slave.WindowsSlave=Este \u00e9 um slave Windows View.Permissions.Title=Vis\u00e3o -Permalink.LastBuild=\u00daltima constru\u00e7\u00e3o -Permalink.LastStableBuild=\u00daltima constru\u00e7\u00e3o est\u00e1vel -Permalink.LastSuccessfulBuild=\u00daltima constru\u00e7\u00e3o bem sucedida -Permalink.LastFailedBuild=\u00daltima constru\u00e7\u00e3o que falhou +Permalink.LastBuild=\u00daltimo build +Permalink.LastStableBuild=\u00daltimo build est\u00e1vel +Permalink.LastSuccessfulBuild=\u00daltimo build bem sucedido +Permalink.LastFailedBuild=\u00daltimo build que falhou # Waiting for next available executor Queue.WaitingForNextAvailableExecutor=Esperando pelo pr\u00f3ximo executor dispon\u00edvel # {0} {0,choice,0#tests|1#test|1Failed to resolve host name {0}. \ -# +# \ +# Failed to resolve host name {0}. \ +# UpdateCenter.Status.UnknownHostException=Erro ao resolver o nome do host {0}. \ Talvez voc\u00ea precise configurar o proxy HTTP? -# \ -# Your container doesn''t use UTF-8 to decode URLs. If you use non-ASCII characters as a job name etc, \ -# this will cause problems. \ -# See Containers and \ +# \ +# Your container doesn''t use UTF-8 to decode URLs. If you use non-ASCII characters as a job name etc, \ +# this will cause problems. \ +# See Containers and \ # Tomcat i18n for more details. Hudson.NotUsesUTF8ToDecodeURL=n\u00e3o use caracteres UTF-8 nas URLs # Checking internet connectivity -UpdateCenter.Status.CheckingInternet=Checando conex\u00e3o com a internet -# \ +UpdateCenter.Status.CheckingInternet=Checando conex\u00e3o com a Internet +# \ # This permission allows users to delete existing views. -View.DeletePermission.Description=Permite aos usu\u00e1rios deletarem as Views +View.DeletePermission.Description=Permite aos usu\u00e1rios removerem as Views # Checking jenkins-ci.org connectivity UpdateCenter.Status.CheckingJavaNet=Verificando conectividade com o site jenkins-ci.org # Authentication and User Management -UpdateCenter.PluginCategory.user= Autentica\u00e7\u00e3o de Gerenciamento de usu\u00e1rio +UpdateCenter.PluginCategory.user= Autentica\u00e7\u00e3o de gerenciamento de usu\u00e1rio # My View -MyView.DisplayName=Minha View +MyView.DisplayName=Minha view # Files in this directory will be served under your http://server/hudson/userContent/ Hudson.USER_CONTENT_README=Arquivos que ser\u00e3o disponibilizados no seu endere\u00e7o http://server/hudson/ArquivosDoUsuario/ # Source Code Management related @@ -243,11 +243,11 @@ UpdateCenter.PluginCategory.scm-related=Gerenciamento de c\u00f3digo fonte # Cancel the effect of the "quiet-down" command. CLI.cancel-quiet-down.shortDescription=Cancela o comando "quiet-down" # Clears the build queue -CLI.clear-queue.shortDescription=Limpa a fila de constru\u00e7\u00e3o +CLI.clear-queue.shortDescription=Limpa a fila de builds # Upstream project {0} is already building. -AbstractProject.UpstreamBuildInProgress=Projeto {0} j\u00e1 esta em constru\u00e7\u00e3o +AbstractProject.UpstreamBuildInProgress=Projeto {0} j\u00e1 esta em builds # A view with name {0} does not exist -MyViewsProperty.ViewExistsCheck.NotExist= A View {0} n\u00e3o existe +MyViewsProperty.ViewExistsCheck.NotExist= A view {0} n\u00e3o existe # {0} {0,choice,0#test failures|1#test failure|1Failed to connect to {0}. \ +Computer.DeletePermission.Description=Permite aos usu\u00e1rios removerem os Slaves +# \ +# Failed to connect to {0}. \ # Perhaps you need to configure HTTP proxy? UpdateCenter.Status.ConnectionFailed=Erro ao conectar {0} / talvez seja necess\u00e1rio configurar o proxy HTTP. @@ -376,27 +376,27 @@ UpdateCenter.PluginCategory.maven=Maven # Slave Computer.Permissions.Title=Slave # Resume using a node for performing builds, to cancel out the earlier "offline-node" command. -CLI.online-node.shortDescription=Continuar usando um N\u00f3 para relizar as constru\u00e7\u00f5es +CLI.online-node.shortDescription=Continuar usando um n\u00f3 para realizar os builds # Artifact Uploaders UpdateCenter.PluginCategory.upload=Carregadores de artefatos # Last unstable build -Permalink.LastUnstableBuild=\u00daltima constru\u00e7\u00e3o inst\u00e1vel +Permalink.LastUnstableBuild=\u00daltimo build inst\u00e1vel # Enables a job -CLI.enable-job.shortDescription=Habilita uma tarefa +CLI.enable-job.shortDescription=Habilita um job # ? Run.Summary.Unknown= # Parameters ParametersDefinitionProperty.DisplayName=Par\u00e2metros -# \ +# \ # This permission grants the ability to start a new build. -AbstractProject.BuildPermission.Description=Permiss\u00e3o para iniciar uma nova constru\u00e7\u00e3o +AbstractProject.BuildPermission.Description=Permiss\u00e3o para iniciar um novo build # Are you sure you want to use network mounted file system for FS root? Note that this directory does not need to be visible to the master. -Slave.Network.Mounted.File.System.Warning=Tem certeza que quer usar uma particao da rede para seu FS ROOT? +Slave.Network.Mounted.File.System.Warning=Tem certeza que quer usar uma parti\u00e7\u00e3o da rede para seu FS ROOT? # group of {0} Label.GroupOf=Grupo de {0} # All nodes of label ''{0}'' are offline Queue.AllNodesOffline=Todos os rotulos ''{0}'' est\u00e3o offline. # Busy executors LoadStatistics.Legends.BusyExecutors=Executores ocupados. -AbstractProject.BuildNow=Construir Agora +AbstractProject.BuildNow=Construir agora ManageJenkinsAction.DisplayName=Gerenciar Jenkins diff --git a/core/src/main/resources/hudson/model/MyView/newViewDetail_pt_BR.properties b/core/src/main/resources/hudson/model/MyView/newViewDetail_pt_BR.properties index 1468ea23e7..bb55b0679f 100644 --- a/core/src/main/resources/hudson/model/MyView/newViewDetail_pt_BR.properties +++ b/core/src/main/resources/hudson/model/MyView/newViewDetail_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -22,4 +22,4 @@ # \ # This view automatically displays all the jobs that the current user has an access to. -blurb=Essa view mostra todas as tarefas que o usu\u00E1rio est\u00E1 acessando +blurb=Essa view mostra todas as jobs que o usu\u00E1rio est\u00E1 acessando diff --git a/core/src/main/resources/hudson/model/MyView/noJob_pt_BR.properties b/core/src/main/resources/hudson/model/MyView/noJob_pt_BR.properties index 56e641093b..3f5abf0aa0 100644 --- a/core/src/main/resources/hudson/model/MyView/noJob_pt_BR.properties +++ b/core/src/main/resources/hudson/model/MyView/noJob_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,4 +21,4 @@ # THE SOFTWARE. # This view has no jobs. -blurb=Essa View nao possui nenhuma tarefa +blurb=Essa view n\u00e3o possui nenhuma job diff --git a/core/src/main/resources/hudson/model/MyViewsProperty/config_pt_BR.properties b/core/src/main/resources/hudson/model/MyViewsProperty/config_pt_BR.properties index aaf837f628..d19c1ff1b3 100644 --- a/core/src/main/resources/hudson/model/MyViewsProperty/config_pt_BR.properties +++ b/core/src/main/resources/hudson/model/MyViewsProperty/config_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Default\ View=Essa View mostra os usu\u00e1rios em modo privado +Default\ View=Essa view mostra os usu\u00e1rios em modo privado # The view selected by default when navigating to the users' private views description=Essa view diff --git a/core/src/main/resources/hudson/model/NoFingerprintMatch/index_pt_BR.properties b/core/src/main/resources/hudson/model/NoFingerprintMatch/index_pt_BR.properties index f91a23c688..dd606f7acb 100644 --- a/core/src/main/resources/hudson/model/NoFingerprintMatch/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/NoFingerprintMatch/index_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,15 +20,15 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -# \ -# Perhaps the projects are not set up correctly and not recording \ -# fingerprints. Check the project setting. +# \ +# Perhaps the projects are not set up correctly and not recording \ +# fingerprints. Check the project setting. cause.2=Talvez o projeto n\u00e3o esteja devidamente configurado -Back\ to\ Dashboard=Voltar ao menu principal +Back\ to\ Dashboard=Voltar ao painel principal # The fingerprint {0} did not match any of the recorded data. description=O fingerprint {0} n\u00e3o casa com nenhum registro gravado No\ matching\ record\ found=Nenhum registro encontrado -# \ -# Perhaps the file was not created under Jenkins. \ +# \ +# Perhaps the file was not created under Jenkins. \ # Maybe it''s a version that someone built locally on his/her own machine. cause.1=Talvez o arquivo n\u00e3o foi criado dentro do Jenkins diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pt_BR.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pt_BR.properties index bc9cbe94ee..602308ba22 100644 --- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -This\ build\ is\ parameterized=Esta constru\u00E7\u00E3o \u00E9 parametrizada -Add\ Parameter=Adicionar Par\u00e2metro +This\ build\ is\ parameterized=Este build \u00E9 parametrizado +Add\ Parameter=Adicionar par\u00e2metro diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/index_pt_BR.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/index_pt_BR.properties index f810b3d8e1..4793926eff 100644 --- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/index_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,5 +21,5 @@ # THE SOFTWARE. LOADING=CARREGANDO -description=Esta constru\u00e7\u00e3o requer par\u00e2metros: +description=Esta builds requer par\u00e2metros: Build=Construir diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_pt_BR.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_pt_BR.properties index 7e0665bbd4..3b5a83cf4b 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_pt_BR.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/core/src/main/resources/hudson/model/ProxyView/configure-entries_pt_BR.properties b/core/src/main/resources/hudson/model/ProxyView/configure-entries_pt_BR.properties index ab237b41fe..1ca935ea22 100644 --- a/core/src/main/resources/hudson/model/ProxyView/configure-entries_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ProxyView/configure-entries_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -The\ name\ of\ a\ global\ view\ that\ will\ be\ shown.=O nome da View global que ser\u00e1 mostrada +The\ name\ of\ a\ global\ view\ that\ will\ be\ shown.=O nome da view global que ser\u00e1 mostrada View\ name=Nome da visualiza\u00E7\u00E3o diff --git a/core/src/main/resources/hudson/model/ProxyView/newViewDetail_pt_BR.properties b/core/src/main/resources/hudson/model/ProxyView/newViewDetail_pt_BR.properties index b4e7754b96..124e8c203a 100644 --- a/core/src/main/resources/hudson/model/ProxyView/newViewDetail_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ProxyView/newViewDetail_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Shows\ the\ content\ of\ a\ global\ view.=Mostrar o conte\u00fado de uma View global +Shows\ the\ content\ of\ a\ global\ view.=Mostrar o conte\u00fado de uma view global diff --git a/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge_pt_BR.properties b/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge_pt_BR.properties index 6822cd05dd..168ecdaefc 100644 --- a/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Keep\ this\ build\ forever=Manter esta constru\u00e7\u00e3o como permanente +Keep\ this\ build\ forever=Manter este build como permanente diff --git a/core/src/main/resources/hudson/model/Run/artifacts-index_pt_BR.properties b/core/src/main/resources/hudson/model/Run/artifacts-index_pt_BR.properties index fc2ef4b5ca..696f878dc3 100644 --- a/core/src/main/resources/hudson/model/Run/artifacts-index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Run/artifacts-index_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build\ Artifacts=Artefatos de Constru\u00e7\u00e3o +Build\ Artifacts=Artefatos de builds diff --git a/core/src/main/resources/hudson/model/Run/confirmDelete_pt_BR.properties b/core/src/main/resources/hudson/model/Run/confirmDelete_pt_BR.properties index a7f66edb40..8c976ea544 100644 --- a/core/src/main/resources/hudson/model/Run/confirmDelete_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Run/confirmDelete_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,6 +21,6 @@ # THE SOFTWARE. Warning=Aviso -cannotMsg=N\u00e3o \u00e9 poss\u00edvel apagar essa constru\u00e7\u00e3o porque ela est\u00e1 {0} -Are\ you\ sure\ about\ deleting\ the\ build?=Tem certeza que deseja excluir a constru\u00e7\u00e3o? +cannotMsg=N\u00e3o \u00e9 poss\u00edvel apagar esse build porque ela est\u00e1 {0} +Are\ you\ sure\ about\ deleting\ the\ build?=Tem certeza que deseja excluir o build? Yes=Sim diff --git a/core/src/main/resources/hudson/model/Run/delete_pt_BR.properties b/core/src/main/resources/hudson/model/Run/delete_pt_BR.properties index 06b15d03a2..e0be9539c1 100644 --- a/core/src/main/resources/hudson/model/Run/delete_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Run/delete_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Delete\ this\ build=Excluir Esta Constru\u00E7\u00E3o +Delete\ this\ build=Excluir este build diff --git a/core/src/main/resources/hudson/model/Run/logKeep_pt_BR.properties b/core/src/main/resources/hudson/model/Run/logKeep_pt_BR.properties index de6fafd66c..25127781e9 100644 --- a/core/src/main/resources/hudson/model/Run/logKeep_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Run/logKeep_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Keep\ this\ build\ forever=Deixar essa constru\u00e7\u00e3o como permanente -Don''t\ keep\ this\ build\ forever= N\u00e3o deixar essa constru\u00e7\u00e3o como permanente -Don't\ keep\ this\ build\ forever=N\u00e3o deixar essa constru\u00e7\u00e3o como permanente +Keep\ this\ build\ forever=Deixar esse build como permanente +Don''t\ keep\ this\ build\ forever= N\u00e3o deixar esse build como permanente +Don't\ keep\ this\ build\ forever=N\u00e3o deixar esse build como permanente diff --git a/core/src/main/resources/hudson/model/Slave/help-launcher_pt_BR.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_pt_BR.properties index 60e112fb49..d02da19515 100644 --- a/core/src/main/resources/hudson/model/Slave/help-launcher_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Slave/help-launcher_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Controls\ how\ Jenkins\ starts\ this\ slave.=Controla como o Jenkins inicia esse Slave +Controls\ how\ Jenkins\ starts\ this\ slave.=Controla como o Jenkins inicia esse slave diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_BR.properties index 19f59f3d19..1fe6f138c2 100644 --- a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_BR.properties +++ b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,10 +21,10 @@ # THE SOFTWARE. # Upgrade to Jenkins {0} is complete, awaiting restart. -UpgradeComplete=Atualiza\u00e7\u00e3o do Jenkins {0} completa, aguardando reinicar. +UpgradeComplete=Atualiza\u00e7\u00e3o do Jenkins {0} completa, aguardando reiniciar. # Upgrade to Jenkins {0} is in progress or failed. UpgradeProgress=Atualiza\u00e7\u00e3o para Jenkins {0} est\u00e1 em andamento ou falhou. Or\ Upgrade\ Automatically=Ou fazer a atualiza\u00e7\u00e3o automaticamente. -# New version of Jenkins ({0}) is available for download \ +# New version of Jenkins ({0}) is available for download \ # (changelog). NewVersionAvailable=Nova vers\u00e3o do Jenkins ({0}) est\u00e1 dispon\u00edvel em download diff --git a/core/src/main/resources/hudson/model/UpdateCenter/RestartJenkinsJob/row_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/RestartJenkinsJob/row_pt_BR.properties index 98aa69d365..034c14c60e 100644 --- a/core/src/main/resources/hudson/model/UpdateCenter/RestartJenkinsJob/row_pt_BR.properties +++ b/core/src/main/resources/hudson/model/UpdateCenter/RestartJenkinsJob/row_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Restarting\ Jenkins=Reiniciando Jenkins +Restarting\ Jenkins=Reiniciando o Jenkins diff --git a/core/src/main/resources/hudson/model/UpdateCenter/body_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/body_pt_BR.properties index 7757a0c8cd..57e295d46d 100644 --- a/core/src/main/resources/hudson/model/UpdateCenter/body_pt_BR.properties +++ b/core/src/main/resources/hudson/model/UpdateCenter/body_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,5 +21,5 @@ # THE SOFTWARE. Go\ back\ to\ the\ top\ page=Voltar para a p\u00E1gina principal -warning=Reinicie o Jenkins quando a instala\u00E7\u00E3o estiver completa e nenhum Job estiver rodando -you\ can\ start\ using\ the\ installed\ plugins\ right\ away=voc\u00EA pode come\u00E7ar a usar os plugins intalados imediatamente +warning=Reinicie o Jenkins quando a instala\u00E7\u00E3o estiver completa e nenhum job estiver rodando +you\ can\ start\ using\ the\ installed\ plugins\ right\ away=voc\u00EA pode come\u00E7ar a usar os plugins instalados imediatamente diff --git a/core/src/main/resources/hudson/model/UpdateCenter/index_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/index_pt_BR.properties index d72c730d1f..45bbb60538 100644 --- a/core/src/main/resources/hudson/model/UpdateCenter/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/UpdateCenter/index_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -23,5 +23,5 @@ Update\ Center=Central de atualiza\u00e7\u00e3o # Once the installation is completed, Jenkins needs to be restarted for changes to take effect. warning=Assim que a instala\u00e7\u00e3 do Jenkins estiver completa, ser\u00e1 necess\u00e1ria sua reinicializa\u00e7\u00e3o para as mudan\u00e7as terem efeito -Installing\ Plugins/Upgrades=Instalando Plugins/Atualizando -Restart\ When\ No\ Jobs\ Are\ Running=Reiniciar quando terminar de executar as tarefas +Installing\ Plugins/Upgrades=Instalando plugins/atualizando +Restart\ When\ No\ Jobs\ Are\ Running=Reiniciar quando terminar de executar as jobs diff --git a/core/src/main/resources/hudson/model/UpdateCenter/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/sidepanel_pt_BR.properties index 3e4fed762b..5b62993780 100644 --- a/core/src/main/resources/hudson/model/UpdateCenter/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/UpdateCenter/sidepanel_pt_BR.properties @@ -1,18 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, -# Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Back\ to\ Dashboard=Voltar ao Painel Principal +Back\ to\ Dashboard=Voltar ao painel principal Manage\ Jenkins=Gerenciar Jenkins -Manage\ Plugins=Gerenciar Plugins +Manage\ Plugins=Gerenciar plugins diff --git a/core/src/main/resources/hudson/model/User/builds_pt_BR.properties b/core/src/main/resources/hudson/model/User/builds_pt_BR.properties index 9b672a5157..19e52ce19d 100644 --- a/core/src/main/resources/hudson/model/User/builds_pt_BR.properties +++ b/core/src/main/resources/hudson/model/User/builds_pt_BR.properties @@ -1,3 +1,3 @@ -# This file is under the MIT License by authors +# This file is under the MIT License by authors, Fernando Boaglio -title=Constru\u00E7\u00F5es de {0} +title=builds de {0} diff --git a/core/src/main/resources/hudson/model/User/delete_pt_BR.properties b/core/src/main/resources/hudson/model/User/delete_pt_BR.properties index ff1857b491..7ed53e1cbe 100644 --- a/core/src/main/resources/hudson/model/User/delete_pt_BR.properties +++ b/core/src/main/resources/hudson/model/User/delete_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,4 +21,4 @@ # THE SOFTWARE. Yes=Sim -Are\ you\ sure\ about\ deleting\ the\ user\ from\ Jenkins?=Tem certeza que quer excluir esse usu\u00e1rio do Jenkins? +Are\ you\ sure\ about\ deleting\ the\ user\ from\ Jenkins?=Tem certeza que deseja excluir esse usu\u00e1rio do Jenkins? diff --git a/core/src/main/resources/hudson/model/User/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/User/sidepanel_pt_BR.properties index dda90212a0..c33092e089 100644 --- a/core/src/main/resources/hudson/model/User/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/User/sidepanel_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -22,7 +22,7 @@ People=Pessoas Status=Estado -Builds=Constru\u00e7\u00f5es +Builds=builds Configure=Configurar -Delete=Deletar -My\ Views=Minhas Views +Delete=Remover +My\ Views=Minhas views diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_pt_BR.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_pt_BR.properties index d6d53e1527..960d16f03e 100644 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/AsynchPeople/index_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -26,4 +26,4 @@ On=Em People=Pessoas All\ People=Todas as pessoas User\ Id=ID do usu\u00E1rio -blurb=Inclui todos os "usu\u00E1rios" conhecidos, incluindo identidades de logins as quais o reino de seguran\u00E7a consegue enumerar, assim como pessoas mencionadas nas mensagens de commits nos registros de mudan\u00E7as gravados. +blurb=Inclui todos os "usu\u00E1rios" conhecidos, incluindo identidades de usu\u00e1rios as quais o reino de seguran\u00E7a consegue enumerar, assim como pessoas mencionadas nas mensagens de commits nos registros de mudan\u00E7as gravados. diff --git a/core/src/main/resources/hudson/model/View/builds_pt_BR.properties b/core/src/main/resources/hudson/model/View/builds_pt_BR.properties index 2fead8e2ca..e80fffcf5a 100644 --- a/core/src/main/resources/hudson/model/View/builds_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/builds_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -buildHistory=Hist\u00f3rico de Constru\u00e7\u00e3o de {0} +buildHistory=Hist\u00f3rico de builds de {0} Export\ as\ plain\ XML=Exportar para XML diff --git a/core/src/main/resources/hudson/model/View/configure_pt_BR.properties b/core/src/main/resources/hudson/model/View/configure_pt_BR.properties index e7a234af8c..52c5c27a8d 100644 --- a/core/src/main/resources/hudson/model/View/configure_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/configure_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -22,6 +22,6 @@ Name=Nome Description=Descri\u00e7\u00e3o -Filter\ build\ queue=Filtrar a lista de constru\u00e7\u00e3o +Filter\ build\ queue=Filtrar a lista de builds Filter\ build\ executors=Filtar a lista de executores diff --git a/core/src/main/resources/hudson/model/View/delete_pt_BR.properties b/core/src/main/resources/hudson/model/View/delete_pt_BR.properties index ed110c3589..371f566ea4 100644 --- a/core/src/main/resources/hudson/model/View/delete_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/delete_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Are\ you\ sure\ about\ deleting\ the\ view?=Tem certeza que deseja excluir a Views? +Are\ you\ sure\ about\ deleting\ the\ view?=Tem certeza que deseja excluir essa view? Yes=Sim diff --git a/core/src/main/resources/hudson/model/View/index_pt_BR.properties b/core/src/main/resources/hudson/model/View/index_pt_BR.properties index 30d92603e0..718c010ccd 100644 --- a/core/src/main/resources/hudson/model/View/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/index_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Dashboard=Painel Principal +Dashboard=Painel principal diff --git a/core/src/main/resources/hudson/model/View/noJob_pt_BR.properties b/core/src/main/resources/hudson/model/View/noJob_pt_BR.properties index 9247ade144..f58b595b83 100644 --- a/core/src/main/resources/hudson/model/View/noJob_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/noJob_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,6 +21,6 @@ # THE SOFTWARE. # This view has no jobs associated with it. -description_1=Essa View n\u00e3o possui nenhuma tarefa associada +description_1=Essa view n\u00e3o possui nenhuma job associada # Please add some. description_2=Por favor adicione alguma. diff --git a/core/src/main/resources/hudson/model/View/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/View/sidepanel_pt_BR.properties index 25754bed8b..6fe329bcd0 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -24,6 +24,6 @@ NewJob=Novo {0} People=Usu\u00E1rios Build\ History=Hist\u00F3rico de compila\u00E7\u00F5es Edit\ View=Editar visualiza\u00E7\u00E3o -Delete\ View=Deletar Visualiza\u00E7\u00E3o +Delete\ View=Remover visualiza\u00E7\u00E3o Project\ Relationship=Relacionamento entre projetos -Check\ File\ Fingerprint=Checar Arquivo Digital +Check\ File\ Fingerprint=Verificar arquivo digital diff --git a/core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties b/core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties index eea8e08d38..f6e2211e2b 100644 --- a/core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,17 +21,17 @@ # THE SOFTWARE. ArchitectureMonitor.DisplayName=Arquitetura -ClockMonitor.DisplayName=Diferen\u00e7a de Rel\u00f3gio -DiskSpaceMonitor.DisplayName=Espa\u00e7o Livre em Disco +ClockMonitor.DisplayName=Diferen\u00e7a de tempo +DiskSpaceMonitor.DisplayName=Espa\u00e7o livre em disco # Time out for last {0} try ResponseTimeMonitor.TimeOut=Time out desde a \u00faltima {0} tentativa # Free Temp Space -TemporarySpaceMonitor.DisplayName=Slote de tempo dispon\u00edvel +TemporarySpaceMonitor.DisplayName=Intervalo de tempo dispon\u00edvel # Response Time ResponseTimeMonitor.DisplayName=Tempo de resposta # Making {0} offline temporarily due to the lack of disk space DiskSpaceMonitor.MarkedOffline=Temporariamente indispon\u00edvel por falta de espa\u00e7o em disco # Free Swap Space -SwapSpaceMonitor.DisplayName=Espa\u00e7o de troca livre +SwapSpaceMonitor.DisplayName=Espa\u00e7o de swap livre # Making {0} offline temporarily because it''s not responding ResponseTimeMonitor.MarkedOffline= Indispon\u00edvel temporariamente por que n\u00e3o est\u00e1 respondendo diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/index_pt_BR.properties b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/index_pt_BR.properties index ca66d9b8ea..7d28dc89fa 100644 --- a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/index_pt_BR.properties +++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/index_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ZFS\ Migration\ Problem=Problema na migra\u00e7\u00e3o ZFS +ZFS\ Migration\ Problem=Problema na migra\u00e7\u00e3o do ZFS diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message_pt_BR.properties b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message_pt_BR.properties index b8e9409cff..2ce378691a 100644 --- a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message_pt_BR.properties +++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ZFS\ migration\ failed.=Migra\u00e7\u00e3o ZFS falhou. -See\ the\ log\ for\ more\ details=Veja o log para maiores detalhes +ZFS\ migration\ failed.=Migra\u00e7\u00e3o do ZFS falhou. +See\ the\ log\ for\ more\ details=Veja o log para mais detalhes diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/confirm_pt_BR.properties b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/confirm_pt_BR.properties index 8cfc66386b..45fd14cb73 100644 --- a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/confirm_pt_BR.properties +++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/confirm_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -28,10 +28,10 @@ mount=montar # Delete {0}.backup delete=Excluir {0}.backup # Jenkins will perform the following steps to migrate your existing data to a ZFS file system. -blurb=Jenkins ir\u00e1 executar os seguintes passos para migrar seus arquivos ZFS +blurb=O Jenkins ir\u00e1 executar os seguintes passos para migrar seus arquivos ZFS # Estes usu\u00E1rios podem se logar no Jenkins. Este \u00E9 um super conjunto desta lista, \ # Create a new ZFS file system {0} and copy all the data into it create=Criar um novo arquivo ZFS{0} e copiar os dados pra ele. Start\ migration=Come\u00e7ar a migra\u00e7\u00e3o -Restart\ itself\ so\ that\ the\ migration\ can\ be\ done\ without\ worrying\ about\ concurrent\ data\ modifications= -ZFS\ file\ system\ creation=Criacao do arquivo ZFS +Restart\ itself\ so\ that\ the\ migration\ can\ be\ done\ without\ worrying\ about\ concurrent\ data\ modifications=Fazer o restart autom\u00e1tico sem se preocupar com alguns dados serem modificados +ZFS\ file\ system\ creation=Cria\u00e7\u00e3o do arquivo ZFS diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/message_pt_BR.properties b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/message_pt_BR.properties index 085b6705e5..d3adf74654 100644 --- a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/message_pt_BR.properties +++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/message_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,7 +21,7 @@ # THE SOFTWARE. Yes,\ please=Sim, por favor -# You are running on Solaris. Would you like Jenkins to create a ZFS file system for you \ +# You are running on Solaris. Would you like Jenkins to create a ZFS file system for you \ # so that you can get the most out of Solaris? -blurb=Voc\u00ea est\u00e1 executando Solaris. Gostaria que o jenkins criasse os arquivos ZFS pra voc\u00ea? +blurb=Voc\u00ea est\u00e1 executando Solaris. Gostaria que o Jenkins criasse os arquivos ZFS pra voc\u00ea? diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_pt_BR.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_pt_BR.properties index 2ca9b2aa9f..6c0934a224 100644 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_pt_BR.properties +++ b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ Host=host JVM\ options=Op\u00E7\u00F5es de JVM Password=Senha -Administrator\ user\ name=Nome do Usu\u00e1rio Administrador -Path\ to\ java\ executable=Camiho para o execut\u00E1vel do Java +Administrator\ user\ name=Nome do usu\u00e1rio administrador +Path\ to\ java\ executable=Caminho para o execut\u00E1vel do Java Run\ service\ as=Executar servi\u00E7o como blurb=Este m\u00E9todo de inicializa\u00E7\u00E3o confia no DCOM e \u00E9 comumente associado com problemas sutis. Ao inv\u00E9s disso, considere utilizar Inicialize Slave Agents utilizando Java Web Start, o que tamb\u00E9m permite a instala\u00E7\u00E3o como um servi\u00E7o Windows mas tamb\u00E9m considerando mais confi\u00E1vel. diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_pt_BR.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_pt_BR.properties index 14c3dfed7e..c24c4b30d2 100644 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_pt_BR.properties +++ b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,9 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -# Starts a Windows slave by a remote management facility built into Windows. \ -# Suitable for managing Windows slaves. \ +# Starts a Windows slave by a remote management facility built into Windows. \ +# Suitable for managing Windows slaves. \ # Slaves need to be IP reachable from the master. -blurb=Iniciar um Windows Slave uma ferramenta de gerenciamento remota - Slave precisam ter um IP alcan\u00e7\u00e1vel pelo mestre \ - +blurb=Iniciar um Windows slave uma ferramenta de gerenciamento remota + slave precisam ter um IP alcan\u00e7\u00e1vel pelo master \ + diff --git a/core/src/main/resources/hudson/os/windows/Messages_pt_BR.properties b/core/src/main/resources/hudson/os/windows/Messages_pt_BR.properties index 13a50daefb..d05d3059b9 100644 --- a/core/src/main/resources/hudson/os/windows/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/os/windows/Messages_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -25,14 +25,14 @@ ManagedWindowsServiceLauncher.StoppingService=Parando o servi\u00e7o # Copying jenkins-slave.exe ManagedWindowsServiceLauncher.CopyingSlaveExe=Copiando jenkins-slave.exe # Installing the Jenkins slave service -ManagedWindowsServiceLauncher.InstallingSlaveService=Instalando o servi\u00e7o Slave +ManagedWindowsServiceLauncher.InstallingSlaveService=Instalando o servi\u00e7o slave # The service didn''t respond. Perphaps it failed to launch? ManagedWindowsServiceLauncher.ServiceDidntRespond=O servi\u00e7o n\u00e3o responde. Talvez falhou no lan\u00e7amento. -# \ +# \ # Let Jenkins control this Windows slave as a Windows service -ManagedWindowsServiceLauncher.DisplayName=Deixar o Jenkins controlar essa janela escrava como um servi\u00e7o do windows +ManagedWindowsServiceLauncher.DisplayName=Deixar o Jenkins controlar essa janela slave como um servi\u00e7o do Windows # .NET Framework 2.0 or later is required on this computer to run a Jenkins slave as a Windows service -ManagedWindowsServiceLauncher.DotNetRequired=Necess\u00e1rio .NET Framework 2.0 instalado para rodar o Slave Jenkins como um servi\u00e7o do windows +ManagedWindowsServiceLauncher.DotNetRequired=Necess\u00e1rio Framework .NET 2.0 instalado para rodar o slave Jenkins como um servi\u00e7o do windows # Connecting to {0} ManagedWindowsServiceLauncher.ConnectingTo=Conectando a {0} # Registering the service diff --git a/core/src/main/resources/hudson/scm/SCM/project-changes_pt_BR.properties b/core/src/main/resources/hudson/scm/SCM/project-changes_pt_BR.properties index 5db8a7b8fc..0290b2fa33 100644 --- a/core/src/main/resources/hudson/scm/SCM/project-changes_pt_BR.properties +++ b/core/src/main/resources/hudson/scm/SCM/project-changes_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -No\ builds.=Sem constru\u00e7\u00f5es. -No\ changes\ in\ any\ of\ the\ builds.=Sem mudan\u00e7as em qualquer uma das constru\u00e7\u00f5es. +No\ builds.=Sem builds. +No\ changes\ in\ any\ of\ the\ builds.=Sem mudan\u00e7as em qualquer um dos builds. detail=detalhes diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_pt_BR.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_pt_BR.properties index 00331e46a4..c13671b8ce 100644 --- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_pt_BR.properties +++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,10 +21,10 @@ # THE SOFTWARE. Home\ directory=Diret\u00f3rio Home -System\ Message=Mensagem do Sistema +System\ Message=Mensagem do sistema Default\ view= View padr\u00e3o LOADING=Carregando -Global\ properties=Propriedades Globais -# \ +Global\ properties=Propriedades globais +# \ # Help make Jenkins better by sending anonymous usage statistics and crash reports to the Jenkins project. statsBlurb=Ajude o Jenkins a melhorar enviando relat\u00f3rios an\u00f5nimos de erro diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_pt_BR.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_pt_BR.properties index 5c8dd1c331..2a28726538 100644 --- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_pt_BR.properties +++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2012, Seiji Sogabe -# +# +# Copyright (c) 2004-2012, Seiji Sogabe, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,10 +21,10 @@ # THE SOFTWARE. LOADING=Carregando -Enable\ security=Habilitar seguranca +Enable\ security=Habilitar segurana TCP\ port\ for\ JNLP\ slave\ agents=Porta TCP para agentes slave JNLP -Markup\ Formatter= -Access\ Control=Control de Acesso -Security\ Realm=Dom\u00ednio (Realm) de Seguran\u00e7a +Markup\ Formatter=Formatador de markup +Access\ Control=Controle de acesso +Security\ Realm=Dom\u00ednio (realm) de seguran\u00e7a Authorization=Autoriza\u00e7\u00e3o Save=Salvar diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config_pt_BR.properties index a182e557dd..c28871db87 100644 --- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config_pt_BR.properties +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,4 +21,4 @@ # THE SOFTWARE. Password=Senha -Confirm\ Password=Confirmar Senha +Confirm\ Password=Confirmar senha diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser_pt_BR.properties index aa6ca31c7e..8bc994cf3e 100644 --- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser_pt_BR.properties +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Create\ User=Criar Usu\u00e1rio +Create\ User=Criar um usu\u00e1rio diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config_pt_BR.properties index b77e6c698a..22cc2d78ec 100644 --- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config_pt_BR.properties +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Allow\ users\ to\ sign\ up=Permitir que usu\u00e1rios se inscrevam +Allow\ users\ to\ sign\ up=Permitir que os usu\u00e1rios se inscrevam diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser_pt_BR.properties index 2941b2c9bc..068f8c295b 100644 --- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser_pt_BR.properties +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Create\ First\ Admin\ User=Criar o primeiro Usu\u00e1rio Administrador +Create\ First\ Admin\ User=Criar o primeiro usu\u00e1rio administrador diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties index 2f78213276..b1c1c835ab 100644 --- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,7 +21,7 @@ # THE SOFTWARE. Name=Nome -User\ Id=Identifica\u00e7\u00e3o do Usu\u00e1rio +User\ Id=Identifica\u00e7\u00e3o do usu\u00e1rio Users=Usu\u00e1rios blurb=Esses usu\u00e1rios podem entrar no Jenkins. Este \u00e9 um sub-conjunto desta lista, que tamb\u00e9m cont\u00e9m os usu\u00e1rios criados de forma autom\u00e1tica ao executarem algum commit nos projetos que o Jenkins tem acesso. diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel_pt_BR.properties index 7ab59da13f..2ad0eb9c92 100644 --- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Back\ to\ Dashboard=Voltar ao Painel Principal +Back\ to\ Dashboard=Voltar ao painel principal Manage\ Jenkins=Gerenciar o Jenkins -Create\ User=Criar Usu\u00e1rio +Create\ User=Criar usu\u00e1rio diff --git a/core/src/main/resources/hudson/security/LegacySecurityRealm/config_pt_BR.properties b/core/src/main/resources/hudson/security/LegacySecurityRealm/config_pt_BR.properties index 0c45194d30..613847da5e 100644 --- a/core/src/main/resources/hudson/security/LegacySecurityRealm/config_pt_BR.properties +++ b/core/src/main/resources/hudson/security/LegacySecurityRealm/config_pt_BR.properties @@ -1,4 +1,4 @@ -# This file is under the MIT License by authors +# This file is under the MIT License by author, Fernando Boaglio Unprotected\ URLs=URLs desprotegidas -blurb=Estas URLs (e URLs iniciando com estes prefixos mais uma /) n\u00E3o devem requerer autentica\u00E7\u00E3o. Se poss\u00EDvel, configure o seu container para passar estas requisi\u00E7\u00F5es diretamente para o Jonkins sem precisar de login. +blurb=Estas URLs (e URLs iniciando com estes prefixos mais uma /) n\u00E3o devem requerer autentica\u00E7\u00E3o. Se poss\u00EDvel, configure o seu cont\u00eainer para passar estas requisi\u00E7\u00F5es diretamente para o Jenkins sem precisar de login. diff --git a/core/src/main/resources/hudson/security/Messages_pt_BR.properties b/core/src/main/resources/hudson/security/Messages_pt_BR.properties index 272fcb7529..a25e8ef343 100644 --- a/core/src/main/resources/hudson/security/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/security/Messages_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -19,11 +19,14 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. +GlobalSecurityConfiguration.DisplayName=Configurar seguran\u00e7a global +GlobalSecurityConfiguration.Description=Fa\u00e7a a seguran\u00e7a no Jenkins; defina quem pode usar/acessar o sistema. +HudsonPrivateSecurityRealm.WouldYouLikeToSignUp=This {0} {1} is new to Jenkins. Would you like to sign up? LegacyAuthorizationStrategy.DisplayName=Modo legado HudsonPrivateSecurityRealm.Details.DisplayName=Senha -HudsonPrivateSecurityRealm.Details.PasswordError=A senha confirmada n\u00e3o \u00e9 igual a senha informada. Por favor assegure-se de digitar a mesma senha duas vezes. +HudsonPrivateSecurityRealm.Details.PasswordError=A senha confirmada n\u00e3o \u00e9 igual \u00e0 senha informada. Por favor assegure-se de digitar a mesma senha duas vezes. UserDetailsServiceProxy.UnableToQuery=N\u00e3o foi poss\u00edvel buscar informa\u00e7\u00f5es do usu\u00e1rio\: {0} @@ -32,24 +35,24 @@ Permission.Permissions.Title=N/A # Success PAMSecurityRealm.Success=Sucesso # Unable to connect to {0} : {1} -LDAPSecurityRealm.UnableToConnect=Incapaz de conectar {0} : {1} +LDAPSecurityRealm.UnableToConnect=No foi possvel conectar {0} : {1} # Logged-in users can do anything FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Usu\u00e1rios logados n\u00e3o conseguem fazer nada # Unix user/group database -PAMSecurityRealm.DisplayName=Usu\u00e1rio Uniz / grupo banco da dados +PAMSecurityRealm.DisplayName=Usu\u00e1rio Unix / grupo banco da dados # User ''{0}'' PAMSecurityRealm.User=Usu\u00e1rio ''{0}'' # {0} needs to belong to group {1} to read /etc/shadow PAMSecurityRealm.BelongToGroup= {0} precisa pertencer ao grupo {1} para ler /etc/shadow # Anyone can do anything -AuthorizationStrategy.DisplayName=Ninguem consegue fazer nada +AuthorizationStrategy.DisplayName=Ningu\u00e9m consegue fazer nada # Invalid port number LDAPSecurityRealm.InvalidPortNumber=N\u00famero de porta inv\u00e1lido # Unknown host: {0} LDAPSecurityRealm.UnknownHost=Host n\u00e3o localizado {0} # uid: {0} PAMSecurityRealm.Uid=uid: {0} -# \ +# \ # Either Jenkins needs to run as {0} or {1} needs to belong to group {2} and ''chmod g+r /etc/shadow'' needs to be done to enable Jenkins to read /etc/shadow PAMSecurityRealm.RunAsUserOrBelongToGroupAndChmod=Jenkins precisa pertencer ao grupo {2} e ter acesso ''chmod g+r /etc/shadow'' para ler a pasta. # Current User @@ -67,6 +70,6 @@ HudsonPrivateSecurityRealm.DisplayName=Base de dados interna do Jenkins # Jenkins needs to be able to read /etc/shadow PAMSecurityRealm.ReadPermission=Jenkins precisa de acesso de leitura em /etc/shadow # Create/delete/modify users that can log in to this Jenkins -HudsonPrivateSecurityRealm.ManageUserLinks.Description=Criar/deletar/modificar usu\u00e1rios que logan no Jenkins +HudsonPrivateSecurityRealm.ManageUserLinks.Description=Criar/remover/modificar usu\u00e1rios que entram no Jenkins # Syntax of server field is SERVER or SERVER:PORT or ldaps://SERVER[:PORT] LDAPSecurityRealm.SyntaxOfServerField=Sintaxe SERVER or SERVER:PORT or ldaps://SERVER[:PORT] diff --git a/core/src/main/resources/hudson/security/SecurityRealm/loginLink_pt_BR.properties b/core/src/main/resources/hudson/security/SecurityRealm/loginLink_pt_BR.properties index b6aae07c30..ad3579bc28 100644 --- a/core/src/main/resources/hudson/security/SecurityRealm/loginLink_pt_BR.properties +++ b/core/src/main/resources/hudson/security/SecurityRealm/loginLink_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -login=Log-in +login=Entrar diff --git a/core/src/main/resources/hudson/security/csrf/GlobalCrumbIssuerConfiguration/config_pt_BR.properties b/core/src/main/resources/hudson/security/csrf/GlobalCrumbIssuerConfiguration/config_pt_BR.properties index 3adf47c46d..6caa2d6d3d 100644 --- a/core/src/main/resources/hudson/security/csrf/GlobalCrumbIssuerConfiguration/config_pt_BR.properties +++ b/core/src/main/resources/hudson/security/csrf/GlobalCrumbIssuerConfiguration/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -22,5 +22,5 @@ Prevent\ Cross\ Site\ Request\ Forgery\ exploits= Prevenir site contra invas\u00f5es Crumbs=Fra\u00e7\u00e3o -Crumb\ Algorithm=Algoritimo CRUMB +Crumb\ Algorithm=Algoritmo crumb diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help_pt_BR.properties b/core/src/main/resources/hudson/slaves/CommandLauncher/help_pt_BR.properties index 784328fc45..cccf5c035e 100644 --- a/core/src/main/resources/hudson/slaves/CommandLauncher/help_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/CommandLauncher/help_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,9 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -# Starts a slave by having Jenkins execute a command from the master. \ +# Starts a slave by having Jenkins execute a command from the master. \ # Use this when the master is capable of remotely executing a process on a slave, such as through ssh/rsh. -blurb=Iniciar um Slave executando por um comando executado no master \ +blurb=Iniciar um slave executando por um comando executado no master \ Se n\u00e3o for poss\u00edvel, execute o comando via ssh/rsh diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_pt_BR.properties b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_pt_BR.properties index 3d4b64c31b..58f89245df 100644 --- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,8 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Relaunch\ slave\ agent=Relan\u00e7ar o agente escravo -# This node is being launched. +Relaunch\ slave\ agent=Relan\u00e7ar o agente slave +# This node is being launched. launchingDescription=Este n\u00f3 est\u00e1 sendo lan\u00e7ado -Launch\ slave\ agent=Lan\u00e7ar agente Slave +Launch\ slave\ agent=Lan\u00e7ar agente slave See\ log\ for\ more\ details=Veja o log para mais detalhes diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_pt_BR.properties b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_pt_BR.properties index c002697a3f..9faf330e30 100644 --- a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -26,4 +26,4 @@ Remote\ FS\ root=Diret\u00F3rio root remoto Labels=R\u00F3tulos Launch\ method=M\u00E9todo de lan\u00E7amento Availability=Disponibilidade -Node\ Properties=Propriedades dos N\u00D3S +Node\ Properties=Propriedades dos n\u00D3S diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_pt_BR.properties b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_pt_BR.properties index 1e6d41f7d1..7a0e6597c5 100644 --- a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,9 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -# \ -# Adds a plain, dumb slave to Jenkins. This is called "dumb" because Jenkins doesn''t provide \ -# higher level of integration with these slaves, such as dynamic provisioning. \ -# Select this type if no other slave types apply — for example such as when you are adding \ +# \ +# Adds a plain, dumb slave to Jenkins. This is called "dumb" because Jenkins doesn''t provide \ +# higher level of integration with these slaves, such as dynamic provisioning. \ +# Select this type if no other slave types apply — for example such as when you are adding \ # a physical computer, virtual machines managed outside Jenkins, etc. -detail=Adiciona um simples, escravo burro ao Jenkins. \u00C9 chamado "burro" porque o Jenkins n\u00E3o prov\u00EA um maior n\u00EDvel de integra\u00E7\u00E3o com estes escravos, como um provisionamento din\u00E2mico. Selecione este tipo se nenhum outro escravo aplica — por exemplo como quando voc\u00EA est\u00E1 adicionando um computador f\u00EDsico, m\u00E1quinas virtuais gerenci\u00E1veis fora do Jenkins, etc. +detail=Adiciona um slave simples e burro ao Jenkins. \u00c9 chamado "burro" porque o Jenkins n\u00e3o prov\u00ea um maior n\u00edvel de integra\u00e7\u00e3o com estes slaves, como um provisionamento din\u00e2mico. Selecione este tipo se nenhum outro slave se aplica; por exemplo como quando voc\u00ea est\u00e1 adicionando um computador f\u00edsico, m\u00e1quinas virtuais gerenci\u00e1veis fora do Jenkins, etc. diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_pt_BR.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/help_pt_BR.properties index 618331c16b..7aee9cf2b8 100644 --- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/help_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,11 +20,11 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -# Starts a slave by launching an agent program through JNLP. \ -# The launch in this case is initiated by the slave, \ -# thus slaves need not be IP reachable from the master (e.g. behind the firewall.) \ +# Starts a slave by launching an agent program through JNLP. \ +# The launch in this case is initiated by the slave, \ +# thus slaves need not be IP reachable from the master (e.g. behind the firewall.) \ # It is still possible to start a launch without GUI, for example as a Windows service. -blurb=Iniciar um Slave pelo programa agente JNLP. \ +blurb=Iniciar um slave pelo programa agente JNLP. \ Nesse caso, o lan\u00e7amento \u00e9 iniciado pelo slave, \ porem o endere\u00e7o IP do Slave precisa ser alcan\u00e7avel pelo master (ex.: firewall ou proxy), Tamb\u00e9m \u00e9 possivel lan\u00e7ar sem GUI, por exemplo como um servi\u00e7o do Windows. diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties index eac1a1c1cd..2bfb44fbf0 100644 --- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,13 +20,13 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Or\ if\ the\ slave\ is\ headless\:=Ou, se o slave \u00e9 sem cabe\u00e7a +Or\ if\ the\ slave\ is\ headless\:=Ou, se o slave \u00e9 sem master # Go to system config screen and change it configure.link.text=V\u00e1 at\u00e9 a tela de configura\u00e7\u00e3o do sistema e providencie a mudan\u00e7a -Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=Conecta Slave ao Jenkins por uma dessas maneiras: -Run\ from\ slave\ command\ line\:=Executar comando de linha pelo Slave +Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=Conecta slave ao Jenkins por uma dessas maneiras: +Run\ from\ slave\ command\ line\:=Executar comando de linha pelo slave launch\ agent=Lan\u00e7ar agente # TCP port for JNLP slave agents is disabled. slaveAgentPort.disabled=Porta TCP para JNLP est\u00e1 desativada -Launch\ agent\ from\ browser\ on\ slave=Lan\u00e7ar agente de um Navegador do Slave +Launch\ agent\ from\ browser\ on\ slave=Lan\u00e7ar agente de um navegador do slave Connected\ via\ JNLP\ agent.=Conectado via JNLP agente. diff --git a/core/src/main/resources/hudson/slaves/Messages_pt_BR.properties b/core/src/main/resources/hudson/slaves/Messages_pt_BR.properties index 9e474c49b6..9818d1caee 100644 --- a/core/src/main/resources/hudson/slaves/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/Messages_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -24,24 +24,24 @@ RetentionStrategy.Always.displayName=Manter este slave ligado tanto quanto for p RetentionStrategy.Demand.displayName=Deixar este slave ligado quando em demanda e desligado quando inativo CommandLauncher.displayName=Lan\u00e7ar o slave via execu\u00e7\u00e3o de comando no Master JNLPLauncher.displayName=Lan\u00e7ar os agentes slave via JNLP -ComputerLauncher.unexpectedError=Erro ErroUnexpected no lan\u00e7amento de um slave. Este \u00e9 provavelmente um bug no Jenkins +ComputerLauncher.unexpectedError=Erro ErrorUnexpected no lan\u00e7amento de um slave. Este \u00e9 provavelmente um bug no Jenkins ComputerLauncher.abortedLaunch=Processo de lan\u00e7amento de slave abortado. # Take this slave on-line according to a schedule -SimpleScheduledRetentionStrategy.displayName=Colocar o Slave online de acordo com o agendamento +SimpleScheduledRetentionStrategy.displayName=Colocar o slave online de acordo com o agendamento # This node is offline because Jenkins failed to launch the slave agent on it. -OfflineCause.LaunchFailed=Esse n\u00f3 est\u00e1 offline porque Jenkins falhou al lan\u00e7ar o agente slave +OfflineCause.LaunchFailed=Esse n\u00f3 est\u00e1 offline porque Jenkins falhou ao lan\u00e7ar o agente slave # Disconnected from CLI -OfflineCause.DisconnectedFromCLI=Disconectado do CLI +OfflineCause.DisconnectedFromCLI=Desconectado do CLI # No launch command specified CommandLauncher.NoLaunchCommand=Sem nenhum comando de lan\u00e7amento especificado # Offline because computer was idle; it will be relaunched when needed. -RetentionStrategy.Demand.OfflineIdle=Offline porque o computador estava ocioso; ser\u00e1 relan\u00e7ado quando necess\u00e1rio. +RetentionStrategy.Demand.OfflineIdle=Offline porque o computador estava ocioso; ser\u00e1 relan\u00e7ado quando necess\u00e1rio. # Repeated ping attempts failed ConnectionActivityMonitor.OfflineCause=Repetidos comandos PING falharam # Disconnected by {0}{1} -SlaveComputer.DisconnectedBy=Disconectado por {0}{1} +SlaveComputer.DisconnectedBy=Desconectado por {0}{1} # Computer has finished its scheduled uptime -SimpleScheduledRetentionStrategy.FinishedUpTime=Computador terminou o seu tempo de atividade programada +SimpleScheduledRetentionStrategy.FinishedUpTime=O computador terminou o seu tempo de atividade programada NodeProvisioner.EmptyString= # Environment variables EnvironmentVariablesNodeProperty.displayName=Vari\u00e1veis de ambiente diff --git a/core/src/main/resources/hudson/slaves/OfflineCause/ChannelTermination/cause_pt_BR.properties b/core/src/main/resources/hudson/slaves/OfflineCause/ChannelTermination/cause_pt_BR.properties index 4f7efeb537..3cd1576f3c 100644 --- a/core/src/main/resources/hudson/slaves/OfflineCause/ChannelTermination/cause_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/OfflineCause/ChannelTermination/cause_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Connection\ was\ broken= +Connection\ was\ broken=A conex\u00e3o foi interrompida diff --git a/core/src/main/resources/hudson/slaves/OfflineCause/LaunchFailed/cause_pt_BR.properties b/core/src/main/resources/hudson/slaves/OfflineCause/LaunchFailed/cause_pt_BR.properties index 2ee2c02460..9a115d28cf 100644 --- a/core/src/main/resources/hudson/slaves/OfflineCause/LaunchFailed/cause_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/OfflineCause/LaunchFailed/cause_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -See\ log\ for\ more\ details=Veja o log para maiores detalhes +See\ log\ for\ more\ details=Veja o log para mais detalhes diff --git a/core/src/main/resources/hudson/slaves/RetentionStrategy/Demand/config_pt_BR.properties b/core/src/main/resources/hudson/slaves/RetentionStrategy/Demand/config_pt_BR.properties index 2e2f8b9d59..1d915ff342 100644 --- a/core/src/main/resources/hudson/slaves/RetentionStrategy/Demand/config_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/RetentionStrategy/Demand/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -23,4 +23,4 @@ In\ demand\ delay=Atraso em demanda Idle\ delay=Atraso de inatividade In\ demand\ delay\ is\ mandatory\ and\ must\ be\ a\ number.=Atraso em demanda \u00e9 obrigat\u00f3rio e precisa ser um n\u00famero -Idle\ delay\ is\ mandatory\ and\ must\ be\ a\ number.=Atraso de Inatividade \u00e9 obrigat\u00f3rio e precisa ser um n\u00famero +Idle\ delay\ is\ mandatory\ and\ must\ be\ a\ number.=Atraso de inatividade \u00e9 obrigat\u00f3rio e precisa ser um n\u00famero diff --git a/core/src/main/resources/hudson/slaves/RetentionStrategy/Scheduled/config_pt_BR.properties b/core/src/main/resources/hudson/slaves/RetentionStrategy/Scheduled/config_pt_BR.properties index 0a7c505c65..ce75096f0d 100644 --- a/core/src/main/resources/hudson/slaves/RetentionStrategy/Scheduled/config_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/RetentionStrategy/Scheduled/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Startup\ Schedule=Agenda de Inicializa\u00e7\u00e3o -Shutdown\ Schedule=Agenda de Desligamento +Startup\ Schedule=Agenda de inicializa\u00e7\u00e3o +Shutdown\ Schedule=Agenda de desligamento diff --git a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_pt_BR.properties b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_pt_BR.properties index 69faa2f1ad..4022c77170 100644 --- a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,10 +20,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Scheduled\ Uptime=Agenda de Uptime -Startup\ Schedule=Agenda de Inicializa\u00e7\u00e3o -# \ +Scheduled\ Uptime=Agenda de uptime +Startup\ Schedule=Agenda de inicializao +# \ # The number of minutes to keep the node up for. If this is longer than the startup schedule, then the node will remain constantly on-line. -uptime.description=O n\u00famero de minutos para manter o n\u00f3 para cima -Keep\ on-line\ while\ jobs\ are\ running=Manter on-line enquanto estiverem rodando tarefas -Scheduled\ Uptime\ is\ mandatory\ and\ must\ be\ a\ number.=Agenda de Uptime \u00e9 obrigat\u00f3ria e precisa ser um n\u00famero. +uptime.description=O n\u00famero de minutos para manter o n\u00f3 no ar +Keep\ on-line\ while\ jobs\ are\ running=Manter on-line enquanto estiverem rodando jobs +Scheduled\ Uptime\ is\ mandatory\ and\ must\ be\ a\ number.=Agenda de uptime \u00e9 obrigat\u00f3ria e precisa ser um n\u00famero. diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect_pt_BR.properties b/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect_pt_BR.properties index d107c6e8f7..626ca5b24a 100644 --- a/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,7 +21,7 @@ # THE SOFTWARE. Are\ you\ sure\ about\ disconnecting?=Tem certeza que quer se desconectar? -disconnect=Disconectar +disconnect=Desconectar Yes=Sim # You can optionally explain why you are taking this node offline, so that others can see why: -blurb=Opcionalmente voc\u00ea pode registrar por que esse N\u00d3 est\u00e1 Offline. +blurb=Opcionalmente voc\u00ea pode explicar por que esse nu00d3 est\u00e1 offline. diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2_pt_BR.properties b/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2_pt_BR.properties index 78e0c7ca77..8586f178a6 100644 --- a/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,5 +21,5 @@ # THE SOFTWARE. Disconnect=Desconectar -System\ Information=Informa\u00e7\u00e3o de Sistema +System\ Information=Informa\u00e7\u00e3o de sistema Log=Log diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel_pt_BR.properties index 10d23aca62..4a7dcb14a9 100644 --- a/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,9 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Back\ to\ List=Voltar para a Lista +Back\ to\ List=Voltar para a lista Status=Estado -Build\ History=Hist\u00f3rico de Constru\u00e7\u00f5es +Build\ History=Hist\u00f3rico de builds Log=Log -System\ Information=Informa\u00e7\u00f5es do Sistema +System\ Information=Informa\u00e7\u00f5es do sistema Disconnect=Desconectar diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_pt_BR.properties b/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_pt_BR.properties index a9768655ac..84945bc239 100644 --- a/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -System\ Information=Informa\u00e7\u00e3o de Sistema -System\ Properties=Propriedades do Sistema +System\ Information=Informa\u00e7t\u00e3o de sistema +System\ Properties=Propriedades do sistema Thread\ Dump=Limpar Threads -Environment\ Variables=Vari\u00e1veis de Ambiente +Environment\ Variables=Vari\u00e1veis de ambiente diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/threadDump_pt_BR.properties b/core/src/main/resources/hudson/slaves/SlaveComputer/threadDump_pt_BR.properties index 819d54ca2f..41430542e6 100644 --- a/core/src/main/resources/hudson/slaves/SlaveComputer/threadDump_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/SlaveComputer/threadDump_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Thread\ Dump=Limpar Threads +Thread\ Dump=Limpar threads # {0} Thread Dump -title=Limpar Threads +title=Limpar threads diff --git a/core/src/main/resources/hudson/tasks/ArtifactArchiver/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/ArtifactArchiver/config_pt_BR.properties index 5b1ce929cd..5ccfeb7b18 100644 --- a/core/src/main/resources/hudson/tasks/ArtifactArchiver/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/ArtifactArchiver/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -lastBuildOnly=Descartar todos menos o \u00faltim artefato conclu\u00eddo com sucesso para economizar espa\u00e7o em disco -Files\ to\ archive=Arquivos para arquivamento +lastBuildOnly=Descartar todos menos o \u00faltimo artefato conclu\u00eddo com sucesso para economizar espa\u00e7o em disco +Files\ to\ archive=Arquivos para arquivar Excludes=Exclus\u00f5es diff --git a/core/src/main/resources/hudson/tasks/BatchFile/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/BatchFile/config_pt_BR.properties index 1e0cce14ed..c7f56ab0ad 100644 --- a/core/src/main/resources/hudson/tasks/BatchFile/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/BatchFile/config_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,5 +21,5 @@ # THE SOFTWARE. # See the list of available environment variables -description=Veja a lista de vari\u00e1veis de ambiente +description=Veja a lista de vari\u00e1veis de ambiente Command=Comando diff --git a/core/src/main/resources/hudson/tasks/BuildTrigger/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/BuildTrigger/config_pt_BR.properties index 596e63b4ae..39110559e2 100644 --- a/core/src/main/resources/hudson/tasks/BuildTrigger/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/BuildTrigger/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,4 +21,4 @@ # THE SOFTWARE. Projects\ to\ build=Projetos para construir -Trigger\ even\ if\ the\ build\ is\ unstable=Disparar mesmo se a constru\u00e7\u00e3o estiver inst\u00e1vel +Trigger\ even\ if\ the\ build\ is\ unstable=Disparar mesmo se o build estiver inst\u00e1vel diff --git a/core/src/main/resources/hudson/tasks/Fingerprinter/FingerprintAction/index_pt_BR.properties b/core/src/main/resources/hudson/tasks/Fingerprinter/FingerprintAction/index_pt_BR.properties index f26b328081..3ef4c38fb0 100644 --- a/core/src/main/resources/hudson/tasks/Fingerprinter/FingerprintAction/index_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/Fingerprinter/FingerprintAction/index_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,10 +20,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Recorded\ Fingerprints=Fingerprints Gravados +Recorded\ Fingerprints=Fingerprints gravados File=Arquivo Original\ owner=Propriet\u00e1rio original Age=Idade more\ details=mais detalhes -this\ build=Esta constru\u00e7\u00e3o +this\ build=Esta builds outside\ Jenkins=fora do Jenkins diff --git a/core/src/main/resources/hudson/tasks/LogRotator/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/LogRotator/config_pt_BR.properties index 71174c5655..1b0d2a62b0 100644 --- a/core/src/main/resources/hudson/tasks/LogRotator/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/LogRotator/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,11 +20,11 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Days\ to\ keep\ builds=Dias para manter as contru\u00e7\u00f5es -if\ not\ empty,\ build\ records\ are\ only\ kept\ up\ to\ this\ number\ of\ days=Se n\u00e3o estiver vazio, registros de constru\u00e7\u00e3o s\u00e3o apenas mantidos para este n\u00famero de dias -Max\ \#\ of\ builds\ to\ keep=# M\u00e1ximo de constru\u00e7\u00f5es para manter -if\ not\ empty,\ only\ up\ to\ this\ number\ of\ build\ records\ are\ kept=Se n\u00e3o estiver vazio, apenas at\u00e9 este n\u00famero de registros de constru\u00e7\u00f5eo s\u00e3o mantidos +Days\ to\ keep\ builds=Dias para manter os builds +if\ not\ empty,\ build\ records\ are\ only\ kept\ up\ to\ this\ number\ of\ days=Se n\u00e3o estiver vazio, os registros de builds ser\u00e3o apenas mantidos por este n\u00famero de dias +Max\ \#\ of\ builds\ to\ keep=# M\u00e1ximo de builds para manter +if\ not\ empty,\ only\ up\ to\ this\ number\ of\ build\ records\ are\ kept=Se n\u00e3o estiver vazio, apenas at\u00e9 este n\u00famero de registros de builds s\u00e3o mantidos Days\ to\ keep\ artifacts=Dias para manter os artefatos Max\ \#\ of\ builds\ to\ keep\ with\ artifacts=O n\u00famero m\u00e1ximo de compila\u00e7\u00f5es para manter com artefatos -if\ not\ empty,\ artifacts\ from\ builds\ older\ than\ this\ number\ of\ days\ will\ be\ deleted,\ but\ the\ logs,\ history,\ reports,\ etc\ for\ the\ build\ will\ be\ kept=Artefatos anteriores a uma data poder\u00e3o ser deletados, mas seus hist\u00f3ricos e relat\u00f3rios ser\u00e3o mantidos. -if\ not\ empty,\ only\ up\ to\ this\ number\ of\ builds\ have\ their\ artifacts\ retained=Se n\u00e3o est\u00e1 vazio, s\u00f3 at\u00e9 este n\u00famero de compila\u00e7\u00f5es ter\u00e3o mantidos seus artefatos +if\ not\ empty,\ artifacts\ from\ builds\ older\ than\ this\ number\ of\ days\ will\ be\ deleted,\ but\ the\ logs,\ history,\ reports,\ etc\ for\ the\ build\ will\ be\ kept=Artefatos anteriores a uma data poder\u00e3o ser removidos, mas seus hist\u00f3ricos e relat\u00f3rios ser\u00e3o mantidos. +if\ not\ empty,\ only\ up\ to\ this\ number\ of\ builds\ have\ their\ artifacts\ retained=Se n\u00e3o estiver vazio, somente at\u00e9 este n\u00famero de compila\u00e7\u00f5es ter\u00e3o seus artefatos mantidos diff --git a/core/src/main/resources/hudson/tasks/Maven/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/Maven/config_pt_BR.properties index 056944a4ac..001e8ab046 100644 --- a/core/src/main/resources/hudson/tasks/Maven/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/Maven/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -22,8 +22,8 @@ Maven\ Version=Vers\u00e3o do Maven Default=Padr\u00e3o -Goals=Objetivos +Goals=Goals POM=POM Properties=Propriedades -Use\ private\ Maven\ repository=Use reposit\u00f3rio privado MAVEN +Use\ private\ Maven\ repository=Use reposit\u00f3rio privado Maven JVM\ Options=Op\u00e7\u00f5es JVM diff --git a/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties b/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties index ef5033135d..e2ebffdc07 100644 --- a/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Jene Jasper, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Jene Jasper, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,40 +20,40 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Ant.DisplayName=Invocar Ant -Ant.ExecFailed=Execu\u00E7\u00E3o de comando falhou. -Ant.GlobalConfigNeeded= Talvez voc\u00EA precise configurar onde sua instala\u00E7\u00E3o do Ant est\u00E1. -Ant.NotADirectory={0} n\u00E3o \u00E9 um diret\u00F3rio -Ant.NotAntDirectory={0} n\u00E3o parece ser um diret\u00F3rio Ant -Ant.ProjectConfigNeeded= Talvez voc\u00EA precise configurar a tarefa para escolher uma de suas instala\u00E7\u00F5es do Ant. +Ant.DisplayName=Chamar Ant +Ant.ExecFailed=Execuo de comando falhou. +Ant.GlobalConfigNeeded= necessrio configurar onde sua instalao do Ant est. +Ant.NotADirectory={0} no um diretrio +Ant.NotAntDirectory={0} no parece ser um diretrio Ant +Ant.ProjectConfigNeeded= necessrio configurar a job para escolher uma de suas instalaes do Ant. -ArtifactArchiver.DeletingOld=Apagando artefatos antigos de {0} +ArtifactArchiver.DeletingOld=Removendo artefatos antigos de {0} ArtifactArchiver.DisplayName=Arquivar os artefatos -ArtifactArchiver.FailedToArchive=Falha ao arquivar artefatos: {0} -ArtifactArchiver.NoIncludes=Nenhum artefato est\u00E1 configurado para arquivamento.\nVoc\u00EA provavelmente esqueceu de informar o padr\u00E3o de arquivo, assim por favor volte para a configura\u00E7\u00E3o e especifique-o.\nSe voc\u00EA na verdade quis arquivar todos os arquivos do workspace, por favor especifique "**" -ArtifactArchiver.NoMatchFound=Nenhum artefato encontrado casa com o padr\u00E3o de arquivo "{0}". Erro de configura\u00E7\u00E3o? +ArtifactArchiver.FailedToArchive=Falha ao arquivar os artefatos: {0} +ArtifactArchiver.NoIncludes=Nenhum artefato est configurado para arquivamento.\n necessrio informar o padro de arquivo, volte para a configurao e especifique-o.\nSe necessitar arquivar todos os arquivos do workspace, por favor especifique "**" +ArtifactArchiver.NoMatchFound=Nenhum artefato encontrado casa com o padro de arquivo "{0}". Erro de configurao? -BatchFile.DisplayName=Executar comando do Windows +BatchFile.DisplayName=Executar no comando do Windows -BuildTrigger.Disabled={0} est\u00E1 desabilitado. Disparo foi pulado +BuildTrigger.Disabled={0} est desabilitado. A trigger foi pulada BuildTrigger.DisplayName=Construir outros projetos -BuildTrigger.InQueue={0} j\u00E1 est\u00E3o na fila -BuildTrigger.NoSuchProject=N\u00E3o existe tal projeto ''{0}''. Voc\u00EA quis dizer ''{1}''? -BuildTrigger.NotBuildable={0} n\u00E3o pode ser constru\u00EDdo -BuildTrigger.Triggering=Disparando uma nova constru\u00E7\u00E3o de {0} +BuildTrigger.InQueue={0} j esto na fila +BuildTrigger.NoSuchProject=No existe tal projeto ''{0}''. Voc quis dizer ''{1}''? +BuildTrigger.NotBuildable={0} no pode ser construdo +BuildTrigger.Triggering=Disparando um novo build de {0} -CommandInterpreter.CommandFailed=execu\u00E7\u00E3o de comando falhou -CommandInterpreter.UnableToDelete=Incapaz de apagar o arquivo de script {0} -CommandInterpreter.UnableToProduceScript=Incapaz de produzir um arquivo de script +CommandInterpreter.CommandFailed=execuo de comando falhou +CommandInterpreter.UnableToDelete=No foi possvel apagar o arquivo de script {0} +CommandInterpreter.UnableToProduceScript=No foi possvel produzir um arquivo de script Fingerprinter.Aborted=Abortado -Fingerprinter.Action.DisplayName=Ver Fingerprints +Fingerprinter.Action.DisplayName=Ver fingerprints Fingerprinter.DigestFailed=Falhou ao computar resumo para {0} Fingerprinter.DisplayName=Gravar fingerprints de arquivos para trilhar o uso Fingerprinter.Failed=Falhou ao gravar fingerprints -Fingerprinter.FailedFor=falhou ao gravar fingerprint para {0} -Fingerprinter.NoArchiving=Artefatos de constru\u00E7\u00E3o s\u00E3o supostos para ter o fingerprint marcado, mas o arquivamento de artefato de constru\u00E7\u00E3o n\u00E3o est\u00E1 configurado -Fingerprinter.NoWorkspace=Incapaz de gravar fingerprints porque n\u00E3o h\u00E1 nenhum workspace +Fingerprinter.FailedFor=Falhou ao gravar fingerprint para {0} +Fingerprinter.NoArchiving=Os artenfatos de builds devem ter o fingerprint marcado, mas o arquivamento de artefato de builds no est configurado +Fingerprinter.NoWorkspace=No foi possvel gravar fingerprints porque no h nenhum workspace Fingerprinter.Recording=Gravando fingerprints JavadocArchiver.DisplayName=Publicar Javadoc @@ -63,15 +63,15 @@ TestJavadocArchiver.DisplayName.Javadoc=Test Javadoc JavadocArchiver.Publishing=Publicando Javadoc JavadocArchiver.UnableToCopy=Incapaz de copiar Javadoc de {0} para {1} -Maven.DisplayName=Invocar alvos Maven de alto n\u00EDvel -Maven.ExecFailed=execu\u00E7\u00E3o de comando falhou -Maven.NotMavenDirectory={0} n\u00E3o parece ser um diret\u00F3rio Maven -Maven.NoExecutable=N\u00E3o pode encontrar nehum execut\u00E1vel em {0} -Maven.NotADirectory={0} n\u00E3o \u00E9 um diret\u00F3rio +Maven.DisplayName=Chamar alvos Maven de alto nvel +Maven.ExecFailed=execuo de comando falhou +Maven.NotMavenDirectory={0} no parece ser um diretrio Maven +Maven.NoExecutable=No pode encontrar nenhum executvel em {0} +Maven.NotADirectory={0} no um diretrio Shell.DisplayName=Executar shell # Cannot find executable from the choosen Ant installation "{0}" -Ant.ExecutableNotFound=N\u00E3o pode ser executado pela instala\u00E7\u00E3o ANT "{0}" +Ant.ExecutableNotFound=No pode ser executado pela instalao ANT "{0}" # Archiving artifacts ArtifactArchiver.ARCHIVING_ARTIFACTS=Arquivando artefatos # Install from Apache diff --git a/core/src/main/resources/hudson/tasks/Shell/global_pt_BR.properties b/core/src/main/resources/hudson/tasks/Shell/global_pt_BR.properties index c1f5e8bbe7..a0570f5e07 100644 --- a/core/src/main/resources/hudson/tasks/Shell/global_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/Shell/global_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,4 +21,4 @@ # THE SOFTWARE. Shell=Shell -Shell\ executable=Execut\u00e1vel para o Shell +Shell\ executable=Execut\u00e1vel para o shell diff --git a/core/src/main/resources/hudson/tasks/junit/CaseResult/index_pt_BR.properties b/core/src/main/resources/hudson/tasks/junit/CaseResult/index_pt_BR.properties index 9b67d72aa9..27e1ff7039 100644 --- a/core/src/main/resources/hudson/tasks/junit/CaseResult/index_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/junit/CaseResult/index_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -25,7 +25,7 @@ skippedFor=Pulou para {0} {0,choice,0#builds|1#build|1 \ - Talvez voc\u00ea possa sobrecarregar o Ant em seu container copiando uma versao do diret\u00f3rio WEB-INF/lib do Jenkins, \ - ou voc\u00ea possa configurar a delega\u00e7\u00e3o do classloader para first-child tal que o Jenkins veja sua pr\u00f3pria c\u00f3pia primeiro? + Talvez voc\u00ea possa sobrecarregar o Ant em seu container copiando uma vers\u00e3o do diret\u00f3rio WEB-INF/lib do Jenkins, \ + ou voc\u00ea possa configurar a delega\u00e7\u00e3o do Classloader para first-child tal que o Jenkins veja sua pr\u00f3pria c\u00f3pia primeiro? diff --git a/core/src/main/resources/hudson/util/IncompatibleVMDetected/index_pt_BR.properties b/core/src/main/resources/hudson/util/IncompatibleVMDetected/index_pt_BR.properties index 5c89f9b2ae..6dd7cd3ce2 100644 --- a/core/src/main/resources/hudson/util/IncompatibleVMDetected/index_pt_BR.properties +++ b/core/src/main/resources/hudson/util/IncompatibleVMDetected/index_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,16 +20,16 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -VM\ Name= -Detected\ JVM= -# \ -# We detected that your JVM is not supported by Jenkins. \ -# This is due to the limitation is one of the libraries that Jenkins uses, namely XStream. \ +VM\ Name=Nome da mquina virtual +Detected\ JVM=JVM detectada +# \ +# We detected that your JVM is not supported by Jenkins. \ +# This is due to the limitation is one of the libraries that Jenkins uses, namely XStream. \ # See this FAQ for more details. errorMessage=N\u00f3s detectamos que o Jenkins n\u00e3o suporta sua JVM. \ Isto se d\u00e1 devido a uma limita\u00e7\u00e3o na biblioteca do Huson, chamada XStream. \ - Veja essa FAQ para maiores detalhes. + Veja essa FAQ para mais detalhes. Version=Vers\u00e3o -Vendor=Fornecedor +Vendor=Fornecedor Error=Erro -OS\ Name=Nome do Sistema operacional +OS\ Name=Nome do sistema operacional diff --git a/core/src/main/resources/hudson/util/JNADoublyLoaded/index_pt_BR.properties b/core/src/main/resources/hudson/util/JNADoublyLoaded/index_pt_BR.properties index 9a29c4ed72..fc7c3ca459 100644 --- a/core/src/main/resources/hudson/util/JNADoublyLoaded/index_pt_BR.properties +++ b/core/src/main/resources/hudson/util/JNADoublyLoaded/index_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,8 +21,8 @@ # THE SOFTWARE. Failed\ to\ load\ JNA= -# Another instance of JNA is already loaded in another classloader, thereby making it impossible for Jenkins \ +# Another instance of JNA is already loaded in another classloader, thereby making it impossible for Jenkins \ # to load its own copy. See Wiki for more details. -blurb=Outra inst\u00e2ncia do JNA j\u00e1 est\u00e1 carregada em outro classloader, impossibilitando ao Jenkins \ -carregar sua propria inst\u00e2ncia.Veja Wiki. +blurb=Outra inst\u00e2ncia do JNA j\u00e1 est\u00e1 carregada em outro Classloader, impossibilitando ao Jenkins \ +carregar sua pr\u00f3pria inst\u00e2ncia.Veja Wiki. diff --git a/core/src/main/resources/hudson/util/NoTempDir/index_pt_BR.properties b/core/src/main/resources/hudson/util/NoTempDir/index_pt_BR.properties index 7dfe7b5e53..5d7dab609f 100644 --- a/core/src/main/resources/hudson/util/NoTempDir/index_pt_BR.properties +++ b/core/src/main/resources/hudson/util/NoTempDir/index_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -22,6 +22,6 @@ Error=Erro description=\ - Incapaz de criar um arquivo tempor\u00e1rio. Isto geralmente \u00e9 causado por \ - uma m\u00e1 configura\u00e7\u00e3o do conteiner. A JVM parece estar usando \ - "{0}" como diret\u00f3rio tempor\u00e1rio. Este diret\u00f3rio existe e est\u00e1 com permiss\u00e3 de escrita? + No foi possvel criar um arquivo tempor\u00e1rio. Isto geralmente \u00e9 causado por \ + uma m\u00e1 configura\u00e7\u00e3o do cont\u00eainer. A JVM parece estar usando \ + "{0}" como diret\u00f3rio tempor\u00e1rio. Este diret\u00f3rio existe e est\u00e1 com permiss\u00e3 de escrita? diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column_pt_BR.properties b/core/src/main/resources/hudson/views/BuildButtonColumn/column_pt_BR.properties index 4e4d798fe2..370af0f1cf 100644 --- a/core/src/main/resources/hudson/views/BuildButtonColumn/column_pt_BR.properties +++ b/core/src/main/resources/hudson/views/BuildButtonColumn/column_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Martin Eigenbrodt, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Martin Eigenbrodt, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build\ scheduled=Constru\u00E7\u00F5es agendadas +Build\ scheduled=Builds agendados Schedule\ a\ build=Agendar um build diff --git a/core/src/main/resources/hudson/views/DefaultMyViewsTabBar/myViewTabs_pt_BR.properties b/core/src/main/resources/hudson/views/DefaultMyViewsTabBar/myViewTabs_pt_BR.properties index b74e64993c..26f0ef5c71 100644 --- a/core/src/main/resources/hudson/views/DefaultMyViewsTabBar/myViewTabs_pt_BR.properties +++ b/core/src/main/resources/hudson/views/DefaultMyViewsTabBar/myViewTabs_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -New\ View=Nova View +New\ View=Nova view diff --git a/core/src/main/resources/hudson/views/DefaultViewsTabBar/viewTabs_pt_BR.properties b/core/src/main/resources/hudson/views/DefaultViewsTabBar/viewTabs_pt_BR.properties index 0c59334b2c..868becce21 100644 --- a/core/src/main/resources/hudson/views/DefaultViewsTabBar/viewTabs_pt_BR.properties +++ b/core/src/main/resources/hudson/views/DefaultViewsTabBar/viewTabs_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -New\ View=Nova Visualiza\u00E7\u00E3o +New\ View=Nova visualiza\u00E7\u00E3o diff --git a/core/src/main/resources/hudson/views/LastFailureColumn/columnHeader_pt_BR.properties b/core/src/main/resources/hudson/views/LastFailureColumn/columnHeader_pt_BR.properties index de299dc479..30db09bba8 100644 --- a/core/src/main/resources/hudson/views/LastFailureColumn/columnHeader_pt_BR.properties +++ b/core/src/main/resources/hudson/views/LastFailureColumn/columnHeader_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Martin Eigenbrodt, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Martin Eigenbrodt, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Last\ Failure=\u00DAltima Falha +Last\ Failure=\u00DAltima falha diff --git a/core/src/main/resources/hudson/views/LastStableColumn/column_pt_BR.properties b/core/src/main/resources/hudson/views/LastStableColumn/column_pt_BR.properties index 7524d7367b..2c68e93898 100644 --- a/core/src/main/resources/hudson/views/LastStableColumn/column_pt_BR.properties +++ b/core/src/main/resources/hudson/views/LastStableColumn/column_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -N/A=N/A +N/A=N/D diff --git a/core/src/main/resources/hudson/views/LastSuccessColumn/columnHeader_pt_BR.properties b/core/src/main/resources/hudson/views/LastSuccessColumn/columnHeader_pt_BR.properties index 4421c30f7c..4bd71dd592 100644 --- a/core/src/main/resources/hudson/views/LastSuccessColumn/columnHeader_pt_BR.properties +++ b/core/src/main/resources/hudson/views/LastSuccessColumn/columnHeader_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Martin Eigenbrodt, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Martin Eigenbrodt, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Last\ Success=\u00DAltimo Sucesso +Last\ Success=\u00DAltimo sucesso diff --git a/core/src/main/resources/hudson/views/Messages_pt_BR.properties b/core/src/main/resources/hudson/views/Messages_pt_BR.properties index 3430c688e9..30c33bec8a 100644 --- a/core/src/main/resources/hudson/views/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/views/Messages_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -25,7 +25,7 @@ LastDurationColumn.DisplayName=\u00f9ltima dura\u00e7\u00e3o # Status StatusColumn.DisplayName=Status # Build Button -BuildButtonColumn.DisplayName=Bot\u00e3o de constru\u00e7\u00e3o +BuildButtonColumn.DisplayName=Bot\u00e3o de builds # Weather WeatherColumn.DisplayName=Tempo # Last Success diff --git a/core/src/main/resources/hudson/views/StatusColumn/columnHeader_pt_BR.properties b/core/src/main/resources/hudson/views/StatusColumn/columnHeader_pt_BR.properties index e7d16247a6..adc83f0105 100644 --- a/core/src/main/resources/hudson/views/StatusColumn/columnHeader_pt_BR.properties +++ b/core/src/main/resources/hudson/views/StatusColumn/columnHeader_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Martin Eigenbrodt, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Martin Eigenbrodt, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Status\ of\ the\ last\ build=Estado da \u00FAltima constru\u00E7\u00E3o +Status\ of\ the\ last\ build=Estado do \u00FAltimo build diff --git a/core/src/main/resources/hudson/views/WeatherColumn/columnHeader_pt_BR.properties b/core/src/main/resources/hudson/views/WeatherColumn/columnHeader_pt_BR.properties index f6b7ae7795..b530df5b74 100644 --- a/core/src/main/resources/hudson/views/WeatherColumn/columnHeader_pt_BR.properties +++ b/core/src/main/resources/hudson/views/WeatherColumn/columnHeader_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Martin Eigenbrodt, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Martin Eigenbrodt, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Weather\ report\ showing\ aggregated\ status\ of\ recent\ builds=Relat\u00F3rio de clima mostrando o estadp consolidado das constru\u00E7\u00F5es recentes +Weather\ report\ showing\ aggregated\ status\ of\ recent\ builds=Relat\u00F3rio de clima mostrando o estado consolidado dos builds recentes diff --git a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_pt_BR.properties b/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_pt_BR.properties index 3b54c46caa..5e1396527f 100644 --- a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_pt_BR.properties +++ b/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,4 +21,4 @@ # THE SOFTWARE. pending=Pendente -cancel\ this\ build=Cancelar essa constru\u00e7\u00e3o +cancel\ this\ build=Cancelar essa builds diff --git a/core/src/main/resources/hudson/widgets/Messages_pt_BR.properties b/core/src/main/resources/hudson/widgets/Messages_pt_BR.properties index 0f380bd233..09cfe08b77 100644 --- a/core/src/main/resources/hudson/widgets/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/widgets/Messages_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -BuildHistoryWidget.DisplayName=Hist\u00f3rico de Constru\u00e7\u00e3o +BuildHistoryWidget.DisplayName=Hist\u00f3rico de builds diff --git a/core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message_pt_BR.properties b/core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message_pt_BR.properties index fca9cc5b8e..da92922f2c 100644 --- a/core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message_pt_BR.properties +++ b/core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message_pt_BR.properties @@ -1,4 +1,4 @@ -# This file is under the MIT License by authors +# This file is under the MIT License by authors, Fernando Boaglio -Setup\ Security=Configura\u00E7\u00F5es de Seguran\u00E7a +Setup\ Security=Configura\u00E7\u00F5es de seguran\u00E7a blurb=O Jenkins sem seguran\u00E7a permite que qualquer um na rede inicie processos. Considere habilitar a autentica\u00E7\u00E3o para evitar acessos indesejados. diff --git a/core/src/main/resources/jenkins/management/Messages_pt_BR.properties b/core/src/main/resources/jenkins/management/Messages_pt_BR.properties index 8d97b38c57..b9246b8808 100644 --- a/core/src/main/resources/jenkins/management/Messages_pt_BR.properties +++ b/core/src/main/resources/jenkins/management/Messages_pt_BR.properties @@ -1,7 +1,7 @@ # # The MIT License # -# Copyright (c) 2012, CloudBees, Intl., Nicolas De loof +# Copyright (c) 2012, CloudBees, Intl., Nicolas De loof, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -23,22 +23,23 @@ # CliLink.Description=Acesse e gerencie o Jenkins pelo shell, ou pelo seu script. -StatisticsLink.DisplayName=Carregar Estat\u00EDsticas -StatisticsLink.Description=Verifica a utiliza\u00E7\u00E3o de recursos e se voc\u00EA precisa de mais computadores para suas constru\u00E7\u00F5es -ReloadLink.DisplayName=Recarregar Configura\u00E7\u00E3o do Disco +StatisticsLink.DisplayName=Carregar estat\u00edsticas +StatisticsLink.Description=Verifica a utiliza\u00e7\u00e3o de recursos e se voc\u00ea precisa de mais computadores para seus builds +ReloadLink.DisplayName=Recarregar configura\u00e7\u00e3o do disco ConfigureLink.DisplayName=Configurar o sistema -ConfigureLink.Description=Configurar op\u00E7\u00F5es globais e caminhos -ReloadLink.Description=Descartar todos os dados carregados na mem\u00F3ria e recarregar tudo do sistema de arquivos.\n\ - \u00DAtil quando voc\u00EA modificou diretamente no disco seus arquivos de configura\u00E7\u00E3o. -PluginsLink.DisplayName=Gerenciar Plugins -SystemInfoLink.DisplayName=Informa\u00E7\u00F5es do Sistema -SystemInfoLink.Description=Mostrar v\u00E1rias informa\u00E7\u00F5es do ambiente para auxiliar na resolu\u00E7\u00E3o de problemas. -SystemLogLink.Description=O log do sistema captura a sa\u00EDda de java.util.logging relacionada ao Jenkins. -ConsoleLink.DisplayName=Console de Script -ConsoleLink.Description=Executa script arbitr\u00E1rio para administrar, diagn\u00F3sticar provlemas ou corrigir problemas. +ConfigureLink.Description=Configurar op\u00e7\u00f5es globais e caminhos +ReloadLink.Description=Descartar todos os dados carregados na mem\u00f3ria e recarregar tudo do sistema de arquivos.\n\ + Isso \u00e9 \u00fatil quando seus arquivos de configura\u00e7\u00e3o foram modificados diretamente no disco. +PluginsLink.DisplayName=Gerenciar plugins +SystemInfoLink.DisplayName=Informa\u00e7\u00f5es do sistema +SystemInfoLink.Description=Mostrar v\u00e1rias informa\u00e7\u00f5es do ambiente para auxiliar na resolu\u00e7\u00e3o de problemas. +SystemLogLink.DisplayName=Log do sistema +SystemLogLink.Description=O log do sistema captura a sa\u00edda de java.util.logging relacionada ao Jenkins. +ConsoleLink.DisplayName=Console de script +ConsoleLink.Description=Executa script arbitr\u00e1rio para administrar, diagnosticar ou corrigir problemas. PluginsLink.Description=Adiciona, remove, desabilita e habilita plugins que podem incrementar as funcionalidades do Jenkins. -ShutdownLink.DisplayName_cancel=Cancelar Desligamento -ShutdownLink.DisplayName_prepare=Preparar para Desligar -ShutdownLink.Description=Interrompe a execu\u00E7\u00E3o de novas constru\u00E7\u00F5es, para que o sistema possa ser eventualmente desligado com seguran\u00E7a. -NodesLink.Description=Adiciona, remove, controla e monitora o v\u00E1rios N\u00F3s -NodesLink.DisplayName= Gerenciar N\u00F3s +ShutdownLink.DisplayName_cancel=Cancelar o desligamento +ShutdownLink.DisplayName_prepare=Preparar para desligar +ShutdownLink.Description=Interrompe a execu\u00e7\u00e3o de novos builds, para que o sistema possa ser eventualmente desligado com seguran\u00e7a. +NodesLink.Description=Adiciona, remove, controla e monitora o v\u00e1rios n\u00f3s +NodesLink.DisplayName= Gerenciar n\u00f3s diff --git a/core/src/main/resources/jenkins/model/GlobalCloudConfiguration/config_pt_BR.properties b/core/src/main/resources/jenkins/model/GlobalCloudConfiguration/config_pt_BR.properties index b27c7d802c..0865651dd7 100644 --- a/core/src/main/resources/jenkins/model/GlobalCloudConfiguration/config_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/GlobalCloudConfiguration/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Delete\ cloud= Apagar cloud +Delete\ cloud= Apagar uma nuvem Cloud=Nuvem Add\ a\ new\ cloud=Adicionar uma nova nuvem diff --git a/core/src/main/resources/jenkins/model/GlobalNodePropertiesConfiguration/config_pt_BR.properties b/core/src/main/resources/jenkins/model/GlobalNodePropertiesConfiguration/config_pt_BR.properties index e609f3edd8..a7141c2845 100644 --- a/core/src/main/resources/jenkins/model/GlobalNodePropertiesConfiguration/config_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/GlobalNodePropertiesConfiguration/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Global\ properties=Propriedades Globais +Global\ properties=Propriedades globais diff --git a/core/src/main/resources/jenkins/model/Jenkins/_restart_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/_restart_pt_BR.properties index 014847c999..701fc92407 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/_restart_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/_restart_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,4 +21,4 @@ # THE SOFTWARE. Yes=Sim -Are\ you\ sure\ about\ restarting\ Jenkins?=Tem certeza que quer reiniciar o Jenkins? +Are\ you\ sure\ about\ restarting\ Jenkins?=Tem certeza que deseja reiniciar o Jenkins? diff --git a/core/src/main/resources/jenkins/model/Jenkins/_safeRestart_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/_safeRestart_pt_BR.properties index 0227bdccae..5b343261cb 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/_safeRestart_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/_safeRestart_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,4 +21,4 @@ # THE SOFTWARE. Yes=Sim -Are\ you\ sure\ about\ restarting\ Jenkins?\ Jenkins\ will\ restart\ once\ all\ running\ jobs\ are\ finished.=Tem certeza que quer reiniciar o Jenkins? +Are\ you\ sure\ about\ restarting\ Jenkins?\ Jenkins\ will\ restart\ once\ all\ running\ jobs\ are\ finished.=Tem certeza que deseja reiniciar o Jenkins? diff --git a/core/src/main/resources/jenkins/model/Jenkins/accessDenied_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/accessDenied_pt_BR.properties index abb052b084..91ac41512d 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/accessDenied_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/accessDenied_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Jenkins\ Login=Jenkins Login +Jenkins\ Login=Entrar no Jenkins Access\ Denied=Acesso negado diff --git a/core/src/main/resources/jenkins/model/Jenkins/configure_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_pt_BR.properties index d4ca5fb9d3..f7a65d3840 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/configure_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/configure_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -24,5 +24,5 @@ Home\ directory=Diret\u00F3rio principal System\ Message=Mensagem do sistema Save=Salvar LOADING=CARREGANDO -Build\ Record\ Root\ Directory=Diret\u00F3rio Ra\u00EDz dos Registros de Constru\u00E7\u00F5es -Workspace\ Root\ Directory=Diret\u00F3rio raiz da \u00C1rea de Trabalho +Build\ Record\ Root\ Directory=Diret\u00F3rio ra\u00EDz dos registros de builds +Workspace\ Root\ Directory=Diret\u00F3rio raiz do workspace diff --git a/core/src/main/resources/jenkins/model/Jenkins/legend_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/legend_pt_BR.properties index 3d74df5aa4..10ace3c7d5 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/legend_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/legend_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -23,28 +23,28 @@ # The last build was successful but unstable. A new build is in progress. yellow_anime=O \u00FAltimo build foi bem-sucedido mas inst\u00E1vel. Um novo build est\u00E1 em andamento. # Project health is over 20% and up to 40%. You can hover the mouse over the project''s icon for a more detailed explanation. -health-21to40=A sa\u00FAde do seu projeto esta entre 20% e 40%. Passe o mouse no \u00EDcone para maiores detalhes. +health-21to40=A sa\u00FAde do seu projeto esta entre 20% e 40%. Passe o mouse no \u00EDcone para mais detalhes. # Project health is over 40% and up to 60%. You can hover the mouse over the project''s icon for a more detailed explanation. -health-41to60=A sa\u00FAde do projeto est\u00E1 entre 40% e 60%. Passe o mouse no \u00EDcone para maiores detalhes. +health-41to60=A sa\u00FAde do projeto est\u00E1 entre 40% e 60%. Passe o mouse no \u00EDcone para mais detalhes. # The last build fatally failed. -red=A \u00FAltima constru\u00E7\u00E3o teve um erro fatal +red=O \u00FAltimo build teve um erro fatal # The project has never been built before, or the project is disabled. grey=Essa foi o primeiro build do projeto, ou esse projeto estava desativado. # Project health is over 60% and up to 80%. You can hover the mouse over the project''s icon for a more detailed explanation. -health-61to80=A sa\u00FAde do projeto est\u00E1 entre 60% e 80%. Passe o mouse no \u00EDcone para maiores detalhes. -# The last build was successful but unstable.\ +health-61to80=A sa\u00FAde do projeto est\u00E1 entre 60% e 80%. Passe o mouse no \u00EDcone para mais detalhes. +# The last build was successful but unstable.\ # This is primarily used to represent test failures. yellow=O \u00FAltimo build foi bem-sucedido, mas inst\u00E1vel. Isto \u00E9 utilizado primeiramente para representar falhas nos testes. # The last build was successful. A new build is in progress. blue_anime=O \u00FAltimo build foi bem-sucedido. Um novo build est\u00E1 em andamento. # Project health is 20% or less. You can hover the mouse over the project''s icon for a more detailed explanation. -health-00to20=A sa\u00FAde do seu projeto est\u00E1 em 20% ou menos. Passe o mouse no \u00EDcone do projeto para maiores detalhes. +health-00to20=A sa\u00FAde do seu projeto est\u00E1 em 20% ou menos. Passe o mouse no \u00EDcone do projeto para mais detalhes. # The first build of the project is in progress. grey_anime=O primeiro build do projeto est\u00E1 em andamento. # The last build was successful. blue=O \u00FAltimo build foi bem-sucedido. # Project health is over 80%. You can hover the mouse over the project''s icon for a more detailed explanation. -health-81plus=A sa\u00FAde do projeto foi maior que 80%. Passe o mouse no \u00EDcone para maiores detalhes. +health-81plus=A sa\u00FAde do projeto foi maior que 80%. Passe o mouse no \u00EDcone para mais detalhes. # The last build fatally failed. A new build is in progress. red_anime=O \u00FAltimo build teve um erro fatal. Um novo build est\u00E1 em andamento. diff --git a/core/src/main/resources/jenkins/model/Jenkins/loginError_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/loginError_pt_BR.properties index d4a5c1147f..7da1ac214f 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/loginError_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/loginError_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -22,5 +22,5 @@ Invalid\ login\ information.\ Please\ try\ again.=Usu\u00e1rio ou senha inv\u00e1lidos. Por favor tente novamente. Try\ again=Tente novamente -Login\ Error=Erro de Login -If\ you\ are\ a\ system\ administrator\ and\ suspect\ this\ to\ be\ a\ configuration\ problem,\ see\ the\ server\ console\ output\ for\ more\ details.=Se voc\u00ea for Administrador do sistema e suspeitar de um problema de configura\u00e7\u00e3o, veja o console de sa\u00edda para maiores detalhes. +Login\ Error=Erro de autentica\u00e7\u00e3o de usu\u00e1rio +If\ you\ are\ a\ system\ administrator\ and\ suspect\ this\ to\ be\ a\ configuration\ problem,\ see\ the\ server\ console\ output\ for\ more\ details.=Se voc\u00ea for administrador do sistema e suspeitar de um problema de configura\u00e7\u00e3o, veja o console de sa\u00edda para mais detalhes. diff --git a/core/src/main/resources/jenkins/model/Jenkins/login_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/login_pt_BR.properties index 012a78ed38..514c556d52 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/login_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/login_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -User=Usuario +User=Usu\u00e1rio Password=Senha Remember\ me\ on\ this\ computer=Salvar minhas informa\u00e7\u00f5es neste computador login=Login diff --git a/core/src/main/resources/jenkins/model/Jenkins/manage_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_pt_BR.properties index b2ed5e4e33..75b46dd2d0 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/manage_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/manage_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,12 +20,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Add,\ remove,\ control\ and\ monitor\ the\ various\ nodes\ that\ Jenkins\ runs\ jobs\ on.=Adicionar, remover, controlar e monitorar os v\u00E1rios N\u00F3s em quem o Jenkins executa seus trabalhos. +Add,\ remove,\ control\ and\ monitor\ the\ various\ nodes\ that\ Jenkins\ runs\ jobs\ on.=Adicionar, remover, controlar e monitorar os v\u00E1rios n\u00F3s em quem o Jenkins executa seus trabalhos. Add,\ remove,\ disable\ or\ enable\ plugins\ that\ can\ extend\ the\ functionality\ of\ Jenkins.=Adicionar, remover, desabilitar e habilitar plugins que podem ampliar as funcionalidades do Jenkins. Executes\ arbitrary\ script\ for\ administration/trouble-shooting/diagnostics.=Executa script arbitr\u00E1rio para administrar, diagn\u00F3sticar problemas ou corrigir problemas. -Load\ Statistics=Estat\u00EDsticas de Carga -LoadStatisticsText=Verificar a utiliza\u00E7\u00E3o de recursos e se voc\u00EA precisa de mais computadores para suas constru\u00E7\u00F5es +Load\ Statistics=Estat\u00EDsticas de carga +LoadStatisticsText=Verificar a utiliza\u00E7\u00E3o de recursos e se voc\u00EA precisa de mais computadores para os seus builds Manage\ Jenkins=Gerenciar o Jenkins -Stops\ executing\ new\ builds,\ so\ that\ the\ system\ can\ be\ eventually\ shut\ down\ safely.=Interrompe a execu\u00E7\u00E3o de novas constru\u00E7\u00F5es, para que o sistema possa ser eventualmente desligar-se com seguran\u00E7a. +Stops\ executing\ new\ builds,\ so\ that\ the\ system\ can\ be\ eventually\ shut\ down\ safely.=Interrompe a execu\u00E7\u00E3o de novos builds, para que o sistema possa eventualmente desligar-se com seguran\u00E7a. Useful\ when\ you\ modified\ config\ files\ directly\ on\ disk.=\u00DAtil quando voc\u00EA modificou, diretamente no disco, seus arquivos de configura\u00E7\u00E3o. are.you.sure={0}: tem certeza? diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_pt_BR.properties index 061839a77c..cafa0ab87c 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -22,11 +22,11 @@ Title=O que \u00e9 "Projeto de relacionamento"? body=\ - Quando voc\u00ea tem projetos que dependem um do outro, o Jenkins pode rastrear qual constru\u00e7\u00e3o \u00e9 hierarquicamente superior, \ + Quando voc\u00ea tem projetos que dependem um do outro, o Jenkins pode rastrear qual build \u00e9 hierarquicamente superior, \ usando os registros criados pelo \ suporte de fingerprint. For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=Para esta caracter\u00edstica funcionar, as seguintes condi\u00e7\u00f5es s\u00e3o necess\u00e1rias -The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=O projeto pai grava os fingerprints de seus artefatos de contru\u00e7\u00e3o +The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=O projeto pai grava os fingerprints de seus artefatos de build This\ allows\ Jenkins\ to\ correlate\ two\ projects.=Isto permite que o Jenkins correlacione dois projetos. The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses=O projeto filho grava o registro no fingerprint do projeto pai diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_pt_BR.properties index 7e90015f7b..3b14806c03 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Project\ Relationship=Relacionamento de Projetos +Project\ Relationship=Relacionamento de projetos upstream\ project=Projeto pai downstream\ project=Projeto filho Compare=Comparar diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_pt_BR.properties index 29430b9a80..5ddde56358 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/systemInfo_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -23,7 +23,7 @@ Name=Nome Pinned=Preso Plugins=Plugins -System\ Properties=Propriedades do Sistema +System\ Properties=Propriedades do sistema Enabled=Habilitado -Environment\ Variables=Vari\u00e1veis de Ambiente +Environment\ Variables=Vari\u00e1veis de ambiente Version=Vers\u00E3o diff --git a/core/src/main/resources/jenkins/model/Jenkins/threadDump_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/threadDump_pt_BR.properties index 9cd4108cf7..ed094ae266 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/threadDump_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/threadDump_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Thread\ Dump=Limpar Threads -Thread\ dump=Limpar Threads +Thread\ Dump=Limpar threads +Thread\ dump=Limpar threads diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties index 64d05ebaa2..baa1a85448 100644 --- a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -System\ Admin\ E-mail\ Address=Endere\u00e7o de E-mail do Administrador do Sistema +System\ Admin\ E-mail\ Address=Endere\u00e7o de e-mail do administrador do sistema Jenkins\ URL=URL do Jenkins diff --git a/core/src/main/resources/jenkins/model/Messages_pt_BR.properties b/core/src/main/resources/jenkins/model/Messages_pt_BR.properties index 583201d057..9eaebd6f1d 100644 --- a/core/src/main/resources/jenkins/model/Messages_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Messages_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -23,26 +23,26 @@ Hudson.BadPortNumber=N\u00famero de porta ruim {0} Hudson.Computer.Caption=Master Hudson.Computer.DisplayName=master -Hudson.ControlCodeNotAllowed=Nenhum c\u00f3digo de controle e permitido: {0} +Hudson.ControlCodeNotAllowed=Nenhum c\u00f3digo de controle \u00e9 permitido: {0} Hudson.DisplayName=Jenkins -Hudson.JobAlreadyExists=Uma tarefa j\u00e1 existe com o nome ''{0}'' -Hudson.NoJavaInPath=Java n\u00e3o esta em seu PATH. Talvez voce precise configurar as JDKs? +Hudson.JobAlreadyExists=Uma job j\u00e1 existe com o nome ''{0}'' +Hudson.NoJavaInPath=Java n\u00e3o est\u00e1 em seu PATH. Talvez seja preciso configurar as JDKs? Hudson.NodeBeingRemoved=O n\u00f3 est\u00e1 sendo removido Hudson.NoName=Nenhum nome foi especificado Hudson.UnsafeChar=''{0}'' n\u00e3o \u00e9 um caracter seguro -Hudson.ViewAlreadyExists=J\u00e1 existe uma View com esse nome "{0}" +Hudson.ViewAlreadyExists=J\u00e1 existe uma view com esse nome "{0}" Hudson.ViewName=Tudo Hudson.NotUsesUTF8ToDecodeURL=n\u00e3o use caracteres UTF-8 nas URLs -Hudson.ReadPermission.Description=Permissao de leitura -Hudson.NodeDescription=NO mestre do Jenkins +Hudson.ReadPermission.Description=Permiss\u00e3o de leitura +Hudson.NodeDescription=N\u00f3 master do Jenkins CLI.safe-restart.shortDescription=Seguro reiniciar o Jenkins -CLI.quiet-down.shortDescription=Desativar em modo silencioso, em prepara\u00e7\u00e3o para o rein\u00edcio. N\u00e3o come\u00e7e nenhuma constru\u00e7\u00e3o. +CLI.quiet-down.shortDescription=Desativar em modo silencioso, em prepara\u00e7\u00e3o para o rein\u00edcio. N\u00e3o comece nenhum build. CLI.cancel-quiet-down.shortDescription=Cancela o comando "quiet-down" -CLI.reload-configuration.shortDescription=Descarta todo o conteudo de mem\u00f3ria e recarrega novamente a partir do arquivo. \ +CLI.reload-configuration.shortDescription=Descarta todo o conte\u00fado de mem\u00f3ria e recarrega novamente a partir do arquivo. \ Indicado quando voc\u00ea modificou os arquivos diretamente no disco. CLI.restart.shortDescription=Reiniciar o Jenkins -CLI.keep-build.shortDescription=Marcar a constru\u00e7\u00e3o como permanente +CLI.keep-build.shortDescription=Marcar o build como permanente # address not configured yet Mailer.Address.Not.Configured=Endere\u00e7o ainda n\u00e3o configurado diff --git a/core/src/main/resources/lib/form/booleanRadio_pt_BR.properties b/core/src/main/resources/lib/form/booleanRadio_pt_BR.properties index bc2baa718f..4dc058c3e0 100644 --- a/core/src/main/resources/lib/form/booleanRadio_pt_BR.properties +++ b/core/src/main/resources/lib/form/booleanRadio_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,4 +21,4 @@ # THE SOFTWARE. Yes=Sim -No= +No=N\u00e3o diff --git a/core/src/main/resources/lib/form/breadcrumb-config-outline_pt_BR.properties b/core/src/main/resources/lib/form/breadcrumb-config-outline_pt_BR.properties index 0f68c58df0..01cf570ef4 100644 --- a/core/src/main/resources/lib/form/breadcrumb-config-outline_pt_BR.properties +++ b/core/src/main/resources/lib/form/breadcrumb-config-outline_pt_BR.properties @@ -1,3 +1,3 @@ -# This file is under the MIT License by authors +# This file is under the MIT License by authors, Fernando Boaglio -configuration=Configura\u00E7\u00E3o +configuration=configura\u00E7\u00E3o diff --git a/core/src/main/resources/lib/hudson/buildListTable_pt_BR.properties b/core/src/main/resources/lib/hudson/buildListTable_pt_BR.properties index 01286f3659..89818f7893 100644 --- a/core/src/main/resources/lib/hudson/buildListTable_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/buildListTable_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,8 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Time\ Since=Tempo Desde +Time\ Since=Tempo desde Status=Estado -Build=Constru\u00e7\u00e3o +Build=Build Click\ to\ center\ timeline\ on\ event=Clique para centralizar a linha do tempo no evento Console\ output=Sa\u00edda do console diff --git a/core/src/main/resources/lib/hudson/executors_pt_BR.properties b/core/src/main/resources/lib/hudson/executors_pt_BR.properties index 88b16bd387..8f5020e158 100644 --- a/core/src/main/resources/lib/hudson/executors_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/executors_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,15 +20,15 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build\ Executor\ Status=Estado do executor de constru\u00E7\u00E3o +Build\ Executor\ Status=Estado do executor de builds Master=Mestre offline=desconectado Dead=Morto Idle=Parado Building=Construindo -terminate\ this\ build=terminar esta constru\u00e7\u00e3o +terminate\ this\ build=terminar esta builds Status=Situa\u00E7\u00E3o -Unknown\ Task=Tarefa n\u00e3o localizada +Unknown\ Task=Job n\u00e3o localizada suspended=suspenso Offline=desconectado -Computers=mestre{0,choice,0#|1# + {0,number} computador ({1} de {2} executores)|1< + {0,number} computadores ({1} de {2} executores)} \ No newline at end of file +Computers=mestre{0,choice,0#|1# + {0,number} computador ({1} de {2} executores)|1< + {0,number} computadores ({1} de {2} executores)} diff --git a/core/src/main/resources/lib/hudson/listScmBrowsers_pt_BR.properties b/core/src/main/resources/lib/hudson/listScmBrowsers_pt_BR.properties index 8b34934d8b..50091e47c7 100644 --- a/core/src/main/resources/lib/hudson/listScmBrowsers_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/listScmBrowsers_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Repository\ browser=Browser Reposit\u00f3rio +Repository\ browser=Navegar no reposit\u00f3rio Auto=Auto diff --git a/core/src/main/resources/lib/hudson/node_pt_BR.properties b/core/src/main/resources/lib/hudson/node_pt_BR.properties index 50a5f61274..c9b0c63452 100644 --- a/core/src/main/resources/lib/hudson/node_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/node_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -master=mestre +master=master diff --git a/core/src/main/resources/lib/hudson/project/config-assignedLabel_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-assignedLabel_pt_BR.properties index 1c67b36de7..c629e2a961 100644 --- a/core/src/main/resources/lib/hudson/project/config-assignedLabel_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-assignedLabel_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Tie\ this\ project\ to\ a\ node=Vincular esse projeto a um N\u00F3 +Tie\ this\ project\ to\ a\ node=Vincular esse projeto a um n\u00F3 diff --git a/core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding_pt_BR.properties index 7e41a46cc0..352217a578 100644 --- a/core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding_pt_BR.properties @@ -1,3 +1,3 @@ -# This file is under the MIT License by authors +# This file is under the MIT License by authors, Fernando Boaglio -Block\ build\ when\ downstream\ project\ is\ building=Bloquear constru\u00E7\u00E3o quando o projeto jusante estiver construindo +Block\ build\ when\ downstream\ project\ is\ building=Bloquear builds quando o projeto corrente estiver construindo diff --git a/core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding_pt_BR.properties index a8aabe7b82..1075d558fb 100644 --- a/core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Block\ build\ when\ upstream\ project\ is\ building=Bloquear constru\u00e7\u00e3o enquanto o projeto pai estiver construindo. +Block\ build\ when\ upstream\ project\ is\ building=Bloquear os builds enquanto o projeto pai estiver construindo. diff --git a/core/src/main/resources/lib/hudson/project/config-buildWrappers_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-buildWrappers_pt_BR.properties index 16a0e39c91..0752f93fb8 100644 --- a/core/src/main/resources/lib/hudson/project/config-buildWrappers_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-buildWrappers_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build\ Environment=Ambiente de Constru\u00e7\u00e3o +Build\ Environment=Ambiente de build diff --git a/core/src/main/resources/lib/hudson/project/config-builders_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-builders_pt_BR.properties index ce3196c6a3..fde8746839 100644 --- a/core/src/main/resources/lib/hudson/project/config-builders_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-builders_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build=Constru\u00e7\u00e3o -Add\ build\ step=Adicionar passo na constru\u00e7\u00e3o +Build=Build +Add\ build\ step=Adicionar passo no build diff --git a/core/src/main/resources/lib/hudson/project/config-concurrentBuild_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-concurrentBuild_pt_BR.properties index a80edab665..d0a2f86076 100644 --- a/core/src/main/resources/lib/hudson/project/config-concurrentBuild_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-concurrentBuild_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -title.concurrentbuilds=Execute as constru\u00E7\u00F5es se necess\u00E1rio +title.concurrentbuilds=Execute os builds se necess\u00E1rio diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_pt_BR.properties index 40a8ab75a0..9a7714e945 100644 --- a/core/src/main/resources/lib/hudson/project/config-disableBuild_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Disable\ Build=Desabilitar Constru\u00e7\u00e3o -No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Nenhuma nova constru\u00e7\u00e3o ser\u00e1 executada at\u00e9 que este projeto seja habilitado novamente. +Disable\ Build=Desabilitar builds +No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Nenhum novo build ser\u00e1 executado at\u00e9 que este projeto seja habilitado novamente. diff --git a/core/src/main/resources/lib/hudson/project/config-publishers2_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-publishers2_pt_BR.properties index ae90e76b9a..d827365336 100644 --- a/core/src/main/resources/lib/hudson/project/config-publishers2_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-publishers2_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Post-build\ Actions=A\u00e7\u00f5es p\u00f3s-constru\u00e7\u00e3o +Post-build\ Actions=A\u00e7\u00f5es p\u00f3s-builds diff --git a/core/src/main/resources/lib/hudson/project/config-publishers_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-publishers_pt_BR.properties index ae90e76b9a..308e42772c 100644 --- a/core/src/main/resources/lib/hudson/project/config-publishers_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-publishers_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Post-build\ Actions=A\u00e7\u00f5es p\u00f3s-constru\u00e7\u00e3o +Post-build\ Actions=A\u00e7\u00f5es p\u00f3s-build diff --git a/core/src/main/resources/lib/hudson/project/config-quietPeriod_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-quietPeriod_pt_BR.properties index 9bd6310bd7..a9069a9b15 100644 --- a/core/src/main/resources/lib/hudson/project/config-quietPeriod_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-quietPeriod_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Quiet\ period=Per\u00edodo de espera Number\ of\ seconds=N\u00famero de segundos diff --git a/core/src/main/resources/lib/hudson/project/config-scm_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-scm_pt_BR.properties index 7cc22639bd..91744c8791 100644 --- a/core/src/main/resources/lib/hudson/project/config-scm_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-scm_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Source\ Code\ Management=Gerenciamento de C\u00f3digo Fonte +Source\ Code\ Management=Gerenciamento de c\u00f3digo fonte diff --git a/core/src/main/resources/lib/hudson/project/config-trigger_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-trigger_pt_BR.properties index 7311c36903..4486303c37 100644 --- a/core/src/main/resources/lib/hudson/project/config-trigger_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-trigger_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build\ Triggers=Disparadores de Constru\u00e7\u00e3o +Build\ Triggers=Trigger de builds diff --git a/core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger_pt_BR.properties index 6fbf6332c9..7a44f0869e 100644 --- a/core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build\ after\ other\ projects\ are\ built=Construir ap\u00f3s os outros projetos serem constru\u00eddos +Build\ after\ other\ projects\ are\ built=Fazer o build ap\u00f3s os outros projetos serem constru\u00eddos Projects\ names=Nomes dos projetos Multiple\ projects\ can\ be\ specified\ like\ ''abc,\ def''=M\u00faltiplos projetos podem ser especificados como ''abc, def'' Multiple\ projects\ can\ be\ specified\ like\ 'abc,\ def'=M\u00faltiplos projetos podem ser especificados como 'abc, def' diff --git a/core/src/main/resources/lib/hudson/project/matrix_pt_BR.properties b/core/src/main/resources/lib/hudson/project/matrix_pt_BR.properties index d5953cd8a5..30bce8c3f3 100644 --- a/core/src/main/resources/lib/hudson/project/matrix_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/matrix_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,4 +21,4 @@ # THE SOFTWARE. Configurations=Configura\u00e7\u00f5es -Configuration\ Matrix=Matriz de Configura\u00e7\u00e3o +Configuration\ Matrix=Matriz de configura\u00e7\u00e3o diff --git a/core/src/main/resources/lib/hudson/project/upstream-downstream_pt_BR.properties b/core/src/main/resources/lib/hudson/project/upstream-downstream_pt_BR.properties index 7371994e5b..cd594c8067 100644 --- a/core/src/main/resources/lib/hudson/project/upstream-downstream_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/upstream-downstream_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Upstream\ Projects=Projetos Piloto +Upstream\ Projects=Projetos pai Downstream\ Projects=Projetos descendentes diff --git a/core/src/main/resources/lib/hudson/queue_pt_BR.properties b/core/src/main/resources/lib/hudson/queue_pt_BR.properties index b823c5aefd..c58a19a651 100644 --- a/core/src/main/resources/lib/hudson/queue_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/queue_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,10 +20,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build\ Queue=Fila de Constru\u00E7\u00E3o{0,choice,0#|0< ({0,number})} -No\ builds\ in\ the\ queue.=Nenhuma constru\u00E7\u00E3o na fila. -Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins est\u00e1 sendo desligado. Nenhuma constru\u00e7\u00e3o futura ser\u00e1 executada. +Build\ Queue=Fila de builds{0,choice,0#|0< ({0,number})} +No\ builds\ in\ the\ queue.=Nenhum build na fila. +Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=O Jenkins est desligando. Nenhum build futuro ser executado. WaitingFor=Aguardando por {0} WaitingSince=Esperando desde {0} cancel=cancelar -Unknown\ Task=Tarefa n\u00e3o localizada +Unknown\ Task=Job no localizada diff --git a/core/src/main/resources/lib/hudson/rssBar_pt_BR.properties b/core/src/main/resources/lib/hudson/rssBar_pt_BR.properties index 24a53544f6..d9a91e8bc2 100644 --- a/core/src/main/resources/lib/hudson/rssBar_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/rssBar_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -23,4 +23,4 @@ Legend=Legenda for\ all=de tudo for\ failures=das falhas -for\ just\ latest\ builds=apenas para os \u00FAltimos build\u00B4s +for\ just\ latest\ builds=apenas para os \u00FAltimos builds diff --git a/core/src/main/resources/lib/hudson/scriptConsole_pt_BR.properties b/core/src/main/resources/lib/hudson/scriptConsole_pt_BR.properties index 8487fe654b..daa9a4de5a 100644 --- a/core/src/main/resources/lib/hudson/scriptConsole_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/scriptConsole_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,12 +20,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Script\ Console=Console de Script +Script\ Console=Console de script Run=Executar Result=Resultado -# \ -# Type in an arbitrary Groovy script and \ -# execute it on the server. Useful for trouble-shooting and diagnostics. \ -# Use the ''println'' command to see the output (if you use System.out, \ +# \ +# Type in an arbitrary Groovy script and \ +# execute it on the server. Useful for trouble-shooting and diagnostics. \ +# Use the ''println'' command to see the output (if you use System.out, \ # it will go to the server''s stdout, which is harder to see.) Example: description=Digite um comando Groovy script qualquer e execute-o no servidor. \u00DAtil para resolu\u00E7\u00E3o de problemas e diagn\u00F3sticos. Use o comando "println" para ver a sa\u00EDda (se voc\u00EA usa System.out, ele ir\u00E1 para o log do servidor, que \u00E9 mais dif\u00EDcil de ver). Exemplo: diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_pt_BR.properties b/core/src/main/resources/lib/layout/breadcrumbBar_pt_BR.properties index 906f41cc52..918ca5958b 100644 --- a/core/src/main/resources/lib/layout/breadcrumbBar_pt_BR.properties +++ b/core/src/main/resources/lib/layout/breadcrumbBar_pt_BR.properties @@ -1,8 +1,9 @@ # This file is under the MIT License by authors +# Translated by Fernando Boaglio DISABLE\ AUTO\ REFRESH=Desabilitar atualiza\u00E7\u00E3o autom\u00E1tica Por exemplo: -Uma aba chamada ''\u00C1rea do Cliente'' deve ser exibido primeiro do que uma aba ''Dados'' e n\u00E3o depois. +Uma aba chamada ''\u00C1rea do Cliente'' deve ser exibido antes do que uma aba ''Dados'' e n\u00E3o depois. diff --git a/core/src/main/resources/lib/layout/main-panel_pt_BR.properties b/core/src/main/resources/lib/layout/main-panel_pt_BR.properties index 3e046173e1..ef8a87e434 100644 --- a/core/src/main/resources/lib/layout/main-panel_pt_BR.properties +++ b/core/src/main/resources/lib/layout/main-panel_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Jenkins\ is\ going\ to\ shut\ down=Jenkins est\u00e1 desligando +Jenkins\ is\ going\ to\ shut\ down=O Jenkins est\u00e1 desligando diff --git a/core/src/main/resources/lib/layout/progressiveRendering_pt_BR.properties b/core/src/main/resources/lib/layout/progressiveRendering_pt_BR.properties index 29cd0bbb22..c18f5c6613 100644 --- a/core/src/main/resources/lib/layout/progressiveRendering_pt_BR.properties +++ b/core/src/main/resources/lib/layout/progressiveRendering_pt_BR.properties @@ -1,3 +1,4 @@ # This file is under the MIT License by authors +# Translated by Fernando Boaglio -progressMessage=Processamento em progresso +progressMessage=Processamento em andamento diff --git a/core/src/main/resources/lib/test/bar_pt_BR.properties b/core/src/main/resources/lib/test/bar_pt_BR.properties index f233138d6e..9d5640c86f 100644 --- a/core/src/main/resources/lib/test/bar_pt_BR.properties +++ b/core/src/main/resources/lib/test/bar_pt_BR.properties @@ -1,17 +1,17 @@ # The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -22,6 +22,6 @@ failures={0} falhas skipped={0} n\u00E3o executados -tests={0} testesNo\ +tests={0} testes No\ tests=testes No\ tests=sem testes diff --git a/war/src/main/webapp/help/security/ldap/userSearchBase_pt_BR.html b/war/src/main/webapp/help/security/ldap/userSearchBase_pt_BR.html index 882300111a..f6dcecce2f 100644 --- a/war/src/main/webapp/help/security/ldap/userSearchBase_pt_BR.html +++ b/war/src/main/webapp/help/security/ldap/userSearchBase_pt_BR.html @@ -1,4 +1,4 @@ -div> +
    Uma das pesquisas que o Jenkins faz no LDAP é localizar o registro do usuário passando o nome do usuário. Se você especificar um DN relativo (do DN raíz) aqui, Jenkins estreitará as pesquisas para a sub-árvore. -- GitLab From 51765382e861355037600d9fc63d4aadedf5d7b1 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 9 Dec 2013 12:38:02 -0500 Subject: [PATCH 0538/1630] [JENKINS-4543] Noting retroactively. --- changelog.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.html b/changelog.html index ab6951a887..8ca5526b01 100644 --- a/changelog.html +++ b/changelog.html @@ -798,6 +798,9 @@ Upcoming changes
  • NPE from MatrixConfiguration.newBuild. (issue 17728) +
  • + Identify the short name of an uploaded plugin from the manifest, so it does not matter what the filename was. + (issue 4543)
  • NPE configuring Copy Artifact with Maven jobs. (issue 17402) -- GitLab From c4bc5ebb333d1146e26676f33a1ef39d3962db69 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 9 Dec 2013 14:59:00 -0500 Subject: [PATCH 0539/1630] =?UTF-8?q?Using=20Prototype=E2=80=99s=20Templat?= =?UTF-8?q?e=20utility=20makes=20inserted=20table=20rows=20shorter=20and?= =?UTF-8?q?=20more=20readable.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Experimented with loading innerHTML of a hidden prototype HTML element, but the browser tried to load the bogus image URLs: http://stackoverflow.com/questions/805107/creating-multiline-strings-in-javascript --- .../resources/lib/hudson/buildListTable.jelly | 66 +++++-------------- 1 file changed, 17 insertions(+), 49 deletions(-) diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly index 296633dd41..b0529ad586 100644 --- a/core/src/main/resources/lib/hudson/buildListTable.jelly +++ b/core/src/main/resources/lib/hudson/buildListTable.jelly @@ -43,62 +43,30 @@ THE SOFTWARE.
    		• ${%Status}
    ${%Status}
    +
    @@ -49,26 +49,33 @@ THE SOFTWARE. - - - - - + + + ${handler.setBuilds(it.builds)} +
    ${%Build}${%Slave}
    - ${r.iconColor.description} - - - ${r.displayName} - - - ${r.durationString} -
    -- GitLab From 102d9fc3ca2c618cc8dc95ab330c40ac80b34a21 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 9 Dec 2013 18:44:26 -0500 Subject: [PATCH 0546/1630] Progress bar should normally be outside, and above, table. --- .../hudson/model/Job/buildTimeTrend.jelly | 54 ++++++++-------- .../resources/lib/hudson/buildListTable.jelly | 62 +++++++++---------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly index 083493abab..f76f1f5a66 100644 --- a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly +++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly @@ -40,6 +40,33 @@ THE SOFTWARE.
    + + + ${handler.setBuilds(it.builds)} + @@ -49,33 +76,6 @@ THE SOFTWARE. - - - ${handler.setBuilds(it.builds)} -
    ${%Slave}
    diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly index 71458c1e5b..fd63fb6bf5 100644 --- a/core/src/main/resources/lib/hudson/buildListTable.jelly +++ b/core/src/main/resources/lib/hudson/buildListTable.jelly @@ -35,6 +35,37 @@ THE SOFTWARE. + + + ${handler.setBuilds(attrs.builds)} + @@ -43,37 +74,6 @@ THE SOFTWARE. - - - ${handler.setBuilds(attrs.builds)} -
    ${%Status}
    -- GitLab From 207d6769b28a741fc1172e990cd23cb7c2d9f710 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 9 Dec 2013 18:49:44 -0500 Subject: [PATCH 0547/1630] So long as we need to define a variable for the tr anyway, it is less scary to terminate the fluid API there between each td. --- .../hudson/model/Job/buildTimeTrend.jelly | 21 ++++++------ .../resources/lib/hudson/buildListTable.jelly | 34 +++++++++---------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly index f76f1f5a66..e389beed31 100644 --- a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly +++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly @@ -45,19 +45,18 @@ THE SOFTWARE. var p = $$('trend'); for (var x = 0; data.length > x; x++) { var e = data[x]; - var tr = new Element('tr'). - insert(new Element('td', {data: e.iconColorOrdinal}). - insert(new Element('img', {width: 16, height: 16, src: '${imagesURL}/16x16/' + e.buildStatusUrl, alt: e.iconColorDescription}))). - insert(new Element('td', {data: e.number}). - insert(new Element('a', {href: e.number + '/', 'class': 'model-link inside'}). - update(e.displayName.escapeHTML()))). - insert(new Element('td', {data: e.duration}). - update(e.durationString.escapeHTML())) + var tr = new Element('tr'); + tr.insert(new Element('td', {data: e.iconColorOrdinal}). + insert(new Element('img', {width: 16, height: 16, src: '${imagesURL}/16x16/' + e.buildStatusUrl, alt: e.iconColorDescription}))); + tr.insert(new Element('td', {data: e.number}). + insert(new Element('a', {href: e.number + '/', 'class': 'model-link inside'}). + update(e.displayName.escapeHTML()))); + tr.insert(new Element('td', {data: e.duration}). + update(e.durationString.escapeHTML())); - .insert(new Element('td'). - update(e.builtOn ? new Element('a', {href: '${rootURL}/computer/' + e.builtOn, 'class': 'model-link inside'}).update(e.builtOnStr) : e.builtOnStr)) + tr.insert(new Element('td'). + update(e.builtOn ? new Element('a', {href: '${rootURL}/computer/' + e.builtOn, 'class': 'model-link inside'}).update(e.builtOnStr) : e.builtOnStr)); - ; p.insert(tr); Behaviour.applySubtree(tr); } diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly index fd63fb6bf5..17d59a4bef 100644 --- a/core/src/main/resources/lib/hudson/buildListTable.jelly +++ b/core/src/main/resources/lib/hudson/buildListTable.jelly @@ -40,23 +40,23 @@ THE SOFTWARE. var p = $$('projectStatus'); for (var x = 0; data.length > x; x++) { var e = data[x]; - var tr = new Element('tr'). - insert(new Element('td', {data: e.iconColorOrdinal}). - insert(new Element('a', {href: '${jobBaseUrl}' + e.url}). - insert(new Element('img', {src: '${imagesURL}/${iconSize}/' + e.buildStatusUrl, alt: e.iconColorDescription, 'class': 'icon${iconSize}'})))). - insert(new Element('td'). - insert(new Element('a', {href: '${jobBaseUrl}' + e.parentUrl, 'class': 'model-link'}). - update(e.parentFullDisplayName)). - insert('\u00A0'). - insert(new Element('a', {href: '${jobBaseUrl}' + e.url, 'class': 'model-link inside'}). - update(e.displayName.escapeHTML()))). - insert(new Element('td', {data: e.timestampString2, tooltip: '${%Click to center timeline on event}', onclick: 'javascript:tl.getBand(0).scrollToCenter(Timeline.DateTime.parseGregorianDateTime("' + e.timestampString2 + '"))'}). - update(e.timestampString.escapeHTML())). - insert(new Element('td', {style: e.buildStatusSummaryWorse ? 'color: red' : ''}). - update(e.buildStatusSummaryMessage.escapeHTML())). - insert(new Element('td'). - insert(new Element('a', {href: '${jobBaseUrl}' + e.url + 'console'}). - insert(new Element('img', {src: '${imagesURL}/${subIconSize}/terminal.png', alt: '${%Console output}', border: 0})))); + var tr = new Element('tr'); + tr.insert(new Element('td', {data: e.iconColorOrdinal}). + insert(new Element('a', {href: '${jobBaseUrl}' + e.url}). + insert(new Element('img', {src: '${imagesURL}/${iconSize}/' + e.buildStatusUrl, alt: e.iconColorDescription, 'class': 'icon${iconSize}'})))); + tr.insert(new Element('td'). + insert(new Element('a', {href: '${jobBaseUrl}' + e.parentUrl, 'class': 'model-link'}). + update(e.parentFullDisplayName)). + insert('\u00A0'). + insert(new Element('a', {href: '${jobBaseUrl}' + e.url, 'class': 'model-link inside'}). + update(e.displayName.escapeHTML()))); + tr.insert(new Element('td', {data: e.timestampString2, tooltip: '${%Click to center timeline on event}', onclick: 'javascript:tl.getBand(0).scrollToCenter(Timeline.DateTime.parseGregorianDateTime("' + e.timestampString2 + '"))'}). + update(e.timestampString.escapeHTML())); + tr.insert(new Element('td', {style: e.buildStatusSummaryWorse ? 'color: red' : ''}). + update(e.buildStatusSummaryMessage.escapeHTML())); + tr.insert(new Element('td'). + insert(new Element('a', {href: '${jobBaseUrl}' + e.url + 'console'}). + insert(new Element('img', {src: '${imagesURL}/${subIconSize}/terminal.png', alt: '${%Console output}', border: 0})))); p.insert(tr); Behaviour.applySubtree(tr); } -- GitLab From 2ac0a3f53475a96441bfbc57f55391c021bc838e Mon Sep 17 00:00:00 2001 From: Alex Earl Date: Tue, 10 Dec 2013 03:26:25 +0000 Subject: [PATCH 0548/1630] Remove getDisplayName --- core/src/main/java/hudson/model/listeners/SCMPollListener.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/main/java/hudson/model/listeners/SCMPollListener.java b/core/src/main/java/hudson/model/listeners/SCMPollListener.java index 27965910fa..1a5a2bf786 100644 --- a/core/src/main/java/hudson/model/listeners/SCMPollListener.java +++ b/core/src/main/java/hudson/model/listeners/SCMPollListener.java @@ -67,8 +67,6 @@ public abstract class SCMPollListener implements ExtensionPoint { */ public void onPollingFailed( AbstractProject project, TaskListener listener, Throwable exception) {} - public String getDisplayName() { return getClass().getSimpleName(); } - public static void fireBeforePolling( AbstractProject project, TaskListener listener ) { for (SCMPollListener l : all()) { try { -- GitLab From c1d487f3256405ea1a43de4cdfffee5d674d4f1b Mon Sep 17 00:00:00 2001 From: Chris Arnott Date: Tue, 10 Dec 2013 09:22:21 +0000 Subject: [PATCH 0549/1630] [JENKINS 13870] Make all test results tables highlight row on hover Added the bigtable css class to all testresults tables that were missing it. --- .../src/main/resources/hudson/tasks/junit/CaseResult/list.jelly | 2 +- .../main/resources/hudson/tasks/junit/ClassResult/body.jelly | 2 +- .../main/resources/hudson/tasks/junit/ClassResult/list.jelly | 2 +- .../resources/hudson/tasks/test/MetaTabulatedResult/list.jelly | 2 +- .../resources/hudson/tasks/test/TrivialTestResult/body.jelly | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly b/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly index f7c2480ec0..99f9b4218f 100644 --- a/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly +++ b/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly @@ -28,7 +28,7 @@ THE SOFTWARE. - +
    diff --git a/core/src/main/resources/hudson/tasks/junit/ClassResult/body.jelly b/core/src/main/resources/hudson/tasks/junit/ClassResult/body.jelly index 6e5f67cfc9..64c7554a6d 100644 --- a/core/src/main/resources/hudson/tasks/junit/ClassResult/body.jelly +++ b/core/src/main/resources/hudson/tasks/junit/ClassResult/body.jelly @@ -26,7 +26,7 @@ THE SOFTWARE.

    ${%All Tests}

    -
    ${%Build} ${%Test Description}
    +
    diff --git a/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly b/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly index 918183b925..3c631ef775 100644 --- a/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly +++ b/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly @@ -25,7 +25,7 @@ THE SOFTWARE. -
    ${%Test name} ${%Duration}
    +
    diff --git a/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/list.jelly b/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/list.jelly index df754d1cf1..277272f560 100644 --- a/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/list.jelly +++ b/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/list.jelly @@ -25,7 +25,7 @@ THE SOFTWARE. -
    ${%Build} ${%Description}
    +
    diff --git a/test/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly b/test/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly index dd673d0f67..a1b51c9061 100644 --- a/test/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly +++ b/test/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly @@ -65,7 +65,7 @@ THE SOFTWARE.

    ${%All Tests}

    -
    ${%Build} ${%Description}
    +
    -- GitLab From 87e2a7e8d5ac995a05b82c1e7839285102c111d0 Mon Sep 17 00:00:00 2001 From: ikedam Date: Tue, 10 Dec 2013 23:53:38 +0900 Subject: [PATCH 0550/1630] [FIXED JENKINS-19976] Enable plugins to load classes from optionally depending plugins even without restarting after depended ones installed. --- .../java/hudson/ClassicPluginStrategy.java | 44 +++++++++++++++++++ core/src/main/java/hudson/PluginManager.java | 17 +++++++ core/src/main/java/hudson/PluginStrategy.java | 8 ++++ 3 files changed, 69 insertions(+) diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index f60166f34e..0cedd1ea25 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -377,6 +377,45 @@ public class ClassicPluginStrategy implements PluginStrategy { plugin.getPlugin().start(); } + /** + * Called when a plugin is deployed, and there is a plugin optionally depending on that plugin. + * The class loader of the existing depending plugin should be updated + * to load classes from the newly deployed plugin. + * + * @param depender the plugin to update its class loader + * @param dependee + * @see hudson.PluginStrategy#updateDependency(hudson.PluginWrapper, hudson.PluginWrapper) + */ + @Override + public void updateDependency(PluginWrapper depender, PluginWrapper dependee) { + DependencyClassLoader classLoader = findAncestorDependencyClassLoader(depender.classLoader); + if (classLoader != null) { + classLoader.updateTransientDependencies(); + LOGGER.log(Level.INFO, "Updated dependency of {0}", depender.getShortName()); + } + } + + private DependencyClassLoader findAncestorDependencyClassLoader(ClassLoader classLoader) + { + for (; classLoader != null; classLoader = classLoader.getParent()) { + if (classLoader instanceof DependencyClassLoader) { + return (DependencyClassLoader)classLoader; + } + + if (classLoader instanceof AntClassLoader) { + // AntClassLoaders hold parents not only as AntClassLoader#getParent() + // but also as AntClassLoader#getConfiguredParent() + DependencyClassLoader ret = findAncestorDependencyClassLoader( + ((AntClassLoader)classLoader).getConfiguredParent() + ); + if (ret != null) { + return ret; + } + } + } + return null; + } + private static File resolve(File base, String relative) { File rel = new File(relative); if(rel.isAbsolute()) @@ -523,6 +562,11 @@ public class ClassicPluginStrategy implements PluginStrategy { this.dependencies = dependencies; } + private void updateTransientDependencies() { + // This will be recalculated at the next time. + transientDependencies = null; + } + private List getTransitiveDependencies() { if (transientDependencies==null) { CyclicGraphDetector cgd = new CyclicGraphDetector() { diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index dc657a9a0b..64371a5dd4 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -450,6 +450,23 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas } catch (ReactorException e) { throw new IOException("Failed to initialize "+ sn +" plugin",e); } + + // recalculate dependencies of plugins optionally depending the newly deployed one. + for (PluginWrapper depender: plugins) { + if (depender.equals(p)) { + // skip itself. + continue; + } + for (Dependency d: depender.getOptionalDependencies()) { + if (d.shortName.equals(p.getShortName())) { + // this plugin depends on the newly loaded one! + // recalculate dependencies! + getPluginStrategy().updateDependency(depender, p); + break; + } + } + } + LOGGER.info("Plugin " + sn + " dynamically installed"); } diff --git a/core/src/main/java/hudson/PluginStrategy.java b/core/src/main/java/hudson/PluginStrategy.java index 6024c3571f..d61e23732a 100644 --- a/core/src/main/java/hudson/PluginStrategy.java +++ b/core/src/main/java/hudson/PluginStrategy.java @@ -77,4 +77,12 @@ public interface PluginStrategy extends ExtensionPoint { * @since 1.400 */ List> findComponents(Class type, Hudson hudson); + + /** + * Called when a plugin that is depended by another plugin is newly deployed. + * + * @param depender plugin depending on dependee. + * @param dependee newly loaded plugin. + */ + void updateDependency(PluginWrapper depender, PluginWrapper dependee); } -- GitLab From a4e011835f33ba78adf6333f63e3f1912a38f611 Mon Sep 17 00:00:00 2001 From: Anders Kindberg Date: Tue, 10 Dec 2013 15:58:54 +0100 Subject: [PATCH 0551/1630] Fix Swedish typo --- core/src/main/resources/lib/form/apply_sv_SE.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/form/apply_sv_SE.properties b/core/src/main/resources/lib/form/apply_sv_SE.properties index ffa3c39f8d..578751a2b0 100644 --- a/core/src/main/resources/lib/form/apply_sv_SE.properties +++ b/core/src/main/resources/lib/form/apply_sv_SE.properties @@ -1,3 +1,3 @@ # This file is under the MIT License by authors -Apply=V\u00E4rkst\u00E4ll +Apply=Verkst\u00E4ll -- GitLab From 9679a6123ed30cb70e4d6e4b389f14d04746b995 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 10 Dec 2013 10:59:43 -0500 Subject: [PATCH 0552/1630] [JENKINS-20892] Noting merge of #1046. --- changelog.html | 3 +++ core/src/main/java/hudson/util/RunList.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index 8ca5526b01..d51476d812 100644 --- a/changelog.html +++ b/changelog.html @@ -67,6 +67,9 @@ Upcoming changes
  • groovysh command did not work in authenticated Jenkins instances. (issue 17929) +
  • + Avoid eagerly loading all builds when displaying lists of them (Build History and Build Time Trend UIs). + (issue 20892)
  • Error page should be visible even if the anonymous user does not have overall/read access. (issue 20866) diff --git a/core/src/main/java/hudson/util/RunList.java b/core/src/main/java/hudson/util/RunList.java index add82eb890..a2b040234d 100644 --- a/core/src/main/java/hudson/util/RunList.java +++ b/core/src/main/java/hudson/util/RunList.java @@ -187,7 +187,7 @@ public class RunList extends AbstractList { /** * Returns elements that satisfy the given predicate. * Warning: this method mutates the original list and then returns it. - * @since TODO + * @since 1.544 */ public RunList filter(Predicate predicate) { size = null; -- GitLab From 89d7570ddd143c197d394bf2b4f5b34e15cbecdc Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 10 Dec 2013 14:33:54 -0500 Subject: [PATCH 0553/1630] [FIXED JENKINS-19400] Configurable retention system for lazy-loaded build references. --- .../model/lazy/AbstractLazyLoadRunMap.java | 3 +- .../jenkins/model/lazy/BuildReference.java | 139 +++++++++++++++++- 2 files changed, 136 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java index 92561a23a4..6d489eef88 100644 --- a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java +++ b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java @@ -33,7 +33,6 @@ import org.kohsuke.accmod.restrictions.NoExternalUse; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; -import java.lang.ref.Reference; import java.util.AbstractMap; import java.util.ArrayList; import java.util.Arrays; @@ -577,7 +576,7 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i return unwrap(old); } - private R unwrap(Reference ref) { + private R unwrap(BuildReference ref) { return ref!=null ? ref.get() : null; } diff --git a/core/src/main/java/jenkins/model/lazy/BuildReference.java b/core/src/main/java/jenkins/model/lazy/BuildReference.java index 7b23203ed7..8b4b35904a 100644 --- a/core/src/main/java/jenkins/model/lazy/BuildReference.java +++ b/core/src/main/java/jenkins/model/lazy/BuildReference.java @@ -1,9 +1,21 @@ package jenkins.model.lazy; +import hudson.Extension; +import hudson.ExtensionPoint; +import hudson.model.Run; +import java.lang.ref.Reference; import java.lang.ref.SoftReference; +import java.lang.ref.WeakReference; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; +import jenkins.model.Jenkins; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; /** - * {@link SoftReference} to a build object. + * Reference (by default a {@link SoftReference}) to a build object. * *

    * To be able to re-retrieve the referent in case it is lost, this class @@ -15,14 +27,27 @@ import java.lang.ref.SoftReference; * and find things in it. * * @author Kohsuke Kawaguchi - * @since 1.485 + * @since 1.485 (but as of TODO not a {@link SoftReference}) */ -public final class BuildReference extends SoftReference { +public final class BuildReference { + + private static final Logger LOGGER = Logger.getLogger(BuildReference.class.getName()); + final String id; + private final Holder holder; public BuildReference(String id, R referent) { - super(referent); this.id = id; + this.holder = findHolder(referent); + } + + /** + * Gets the build if still in memory. + * @return the actual build, or null if it has been collected + * @see Holder#get + */ + public @CheckForNull R get() { + return holder.get(); } @Override @@ -39,4 +64,110 @@ public final class BuildReference extends SoftReference { public int hashCode() { return id.hashCode(); } + + /** + * An abstraction of {@link Reference}. + * @since TODO + */ + public interface Holder { + + /** + * Gets a build. + * @return the build reference, or null if collected + */ + @CheckForNull R get(); + + } + + /** + * Extensible factory for creating build references. + * @since TODO + */ + public interface HolderFactory extends ExtensionPoint { + + /** + * Constructs a single build reference. + * @param the type of thing (generally {@link Run}) + * @param referent the thing to load + * @return a reference, or null to consult the next factory + */ + @CheckForNull Holder make(@Nonnull R referent); + + } + + private static Holder findHolder(R referent) { + if (referent == null) { + // AbstractBuild.NONE + return new DefaultHolderFactory.NoHolder(); + } + for (HolderFactory f : Jenkins.getInstance().getExtensionList(HolderFactory.class)) { + Holder h = f.make(referent); + if (h != null) { + LOGGER.log(Level.FINE, "created build reference for {0} using {1}", new Object[] {referent, f}); + return h; + } + } + throw new IllegalStateException(); + } + + /** + * Default factory if none other are installed. + * Its behavior can be controlled via the system property {@link DefaultHolderFactory#MODE_PROPERTY}: + *

    + *
    soft (default) + *
    Use {@link SoftReference}s. Builds will be kept around so long as memory pressure is not too high. + *
    weak + *
    Use {@link WeakReference}s. Builds will be kept only until the next full garbage collection cycle. + *
    strong + *
    Use strong references. Builds will still be loaded lazily, but once loaded, will not be released. + *
    none + *
    Do not hold onto builds at all. Mainly offered as an option for the purpose of reproducing lazy-loading bugs. + *
    + */ + @Restricted(DoNotUse.class) + @Extension(ordinal=Double.NEGATIVE_INFINITY) public static final class DefaultHolderFactory implements HolderFactory { + + public static final String MODE_PROPERTY = "jenkins.model.lazy.BuildReference.MODE"; + private static final String mode = System.getProperty(MODE_PROPERTY); + + @Override public Holder make(R referent) { + if (mode == null || mode.equals("soft")) { + return new SoftHolder(referent); + } else if (mode.equals("weak")) { + return new WeakHolder(referent); + } else if (mode.equals("strong")) { + return new StrongHolder(referent); + } else if (mode.equals("none")) { + return new NoHolder(); + } else { + throw new IllegalStateException("unrecognized value of " + MODE_PROPERTY + ": " + mode); + } + } + + private static final class SoftHolder extends SoftReference implements Holder { + SoftHolder(R referent) { + super(referent); + } + } + + private static final class WeakHolder extends WeakReference implements Holder { + WeakHolder(R referent) { + super(referent); + } + } + + private static final class StrongHolder implements Holder { + private final R referent; + StrongHolder(R referent) { + this.referent = referent; + } + @Override public R get() {return referent;} + } + + private static final class NoHolder implements Holder { + @Override public R get() {return null;} + } + + } + } -- GitLab From 0958b28b0875c5a864614f37a862a05bedc45aec Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 10 Dec 2013 16:52:38 -0500 Subject: [PATCH 0554/1630] Fixed AbstractLazyLoadRunMapTest failure. --- .../jenkins/model/lazy/BuildReference.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/jenkins/model/lazy/BuildReference.java b/core/src/main/java/jenkins/model/lazy/BuildReference.java index 8b4b35904a..4afb3f0194 100644 --- a/core/src/main/java/jenkins/model/lazy/BuildReference.java +++ b/core/src/main/java/jenkins/model/lazy/BuildReference.java @@ -12,7 +12,7 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.DoNotUse; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Reference (by default a {@link SoftReference}) to a build object. @@ -100,14 +100,17 @@ public final class BuildReference { // AbstractBuild.NONE return new DefaultHolderFactory.NoHolder(); } - for (HolderFactory f : Jenkins.getInstance().getExtensionList(HolderFactory.class)) { - Holder h = f.make(referent); - if (h != null) { - LOGGER.log(Level.FINE, "created build reference for {0} using {1}", new Object[] {referent, f}); - return h; + Jenkins j = Jenkins.getInstance(); + if (j != null) { + for (HolderFactory f : j.getExtensionList(HolderFactory.class)) { + Holder h = f.make(referent); + if (h != null) { + LOGGER.log(Level.FINE, "created build reference for {0} using {1}", new Object[] {referent, f}); + return h; + } } } - throw new IllegalStateException(); + return new DefaultHolderFactory().make(referent); } /** @@ -124,7 +127,7 @@ public final class BuildReference { *
    Do not hold onto builds at all. Mainly offered as an option for the purpose of reproducing lazy-loading bugs. * */ - @Restricted(DoNotUse.class) + @Restricted(NoExternalUse.class) @Extension(ordinal=Double.NEGATIVE_INFINITY) public static final class DefaultHolderFactory implements HolderFactory { public static final String MODE_PROPERTY = "jenkins.model.lazy.BuildReference.MODE"; -- GitLab From fcdf74991226fb6869052caa89ed8d678944b6fc Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 10 Dec 2013 17:49:41 -0500 Subject: [PATCH 0555/1630] [FIXED JENKINS-18410] AbstractTestResultAction should be a RunAction2 so it need not persist its owning build. --- changelog.html | 3 ++ .../tasks/junit/JUnitResultArchiver.java | 3 +- .../hudson/tasks/junit/TestResultAction.java | 6 ++++ .../tasks/test/AbstractTestResultAction.java | 32 +++++++++++++------ .../test/AggregatedTestResultAction.java | 4 +++ .../test/AggregatedTestResultPublisher.java | 7 +++- .../hudson/tasks/test/MatrixTestResult.java | 5 +++ .../tasks/test/TestResultAggregator.java | 2 +- .../tasks/test/TrivialTestResultAction.java | 7 ++++ .../tasks/test/TrivialTestResultRecorder.java | 4 +-- 10 files changed, 59 insertions(+), 14 deletions(-) diff --git a/changelog.html b/changelog.html index d51476d812..58ccb7ea64 100644 --- a/changelog.html +++ b/changelog.html @@ -61,6 +61,9 @@ Upcoming changes
  • Hudson shows 0GB free space when space available drops below 1GB. (issue 7776) +
  • + Avoiding serializing the owning build as part of a test result action, as this can lead to errors later. + (issue 18410)
  • Added filter field for installed plugins tab. (issue 20219) diff --git a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java index 50d5d784e8..6dea15b9ed 100644 --- a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java +++ b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java @@ -133,6 +133,7 @@ public class JUnitResultArchiver extends Recorder implements MatrixAggregatable TestResult result = parse(testResults, build, launcher, listener); try { + // TODO can the build argument be omitted now, or is it used prior to the call to addAction? action = new TestResultAction(build, result, listener); } catch (NullPointerException npe) { throw new AbortException(Messages.JUnitResultArchiver_BadXML(testResults)); @@ -173,7 +174,7 @@ public class JUnitResultArchiver extends Recorder implements MatrixAggregatable return true; } - build.getActions().add(action); + build.addAction(action); CHECKPOINT.report(); if (action.getResult().getFailCount() > 0) diff --git a/core/src/main/java/hudson/tasks/junit/TestResultAction.java b/core/src/main/java/hudson/tasks/junit/TestResultAction.java index c27053e7a3..4c48e1b74b 100644 --- a/core/src/main/java/hudson/tasks/junit/TestResultAction.java +++ b/core/src/main/java/hudson/tasks/junit/TestResultAction.java @@ -62,11 +62,17 @@ public class TestResultAction extends AbstractTestResultAction private Integer totalCount; private List testData = new ArrayList(); + @Deprecated public TestResultAction(AbstractBuild owner, TestResult result, BuildListener listener) { super(owner); setResult(result, listener); } + /** @since 1.544 */ + public TestResultAction(TestResult result, BuildListener listener) { + this(null, result, listener); + } + /** * Overwrites the {@link TestResult} by a new data set. */ diff --git a/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java b/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java index 16ac32ad1d..925e0fb99b 100644 --- a/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java +++ b/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java @@ -28,6 +28,14 @@ import hudson.model.*; import hudson.tasks.junit.CaseResult; import hudson.util.*; import hudson.util.ChartUtil.NumberOnlyBuildLabel; + +import java.awt.*; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import jenkins.model.RunAction2; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; @@ -44,13 +52,6 @@ import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; -import java.awt.*; -import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - /** * Common base class for recording test result. * @@ -61,15 +62,28 @@ import java.util.concurrent.ConcurrentHashMap; * @author Kohsuke Kawaguchi */ @ExportedBean -public abstract class AbstractTestResultAction implements HealthReportingAction { - public final AbstractBuild owner; +public abstract class AbstractTestResultAction implements HealthReportingAction, RunAction2 { + public transient AbstractBuild owner; private Map descriptions = new ConcurrentHashMap(); + /** @since 1.544 */ + protected AbstractTestResultAction() {} + + /** @deprecated Use the default constructor and just call {@link Run#addAction} to associate the build with the action. */ + @Deprecated protected AbstractTestResultAction(AbstractBuild owner) { this.owner = owner; } + @Override public void onAttached(Run r) { + this.owner = (AbstractBuild) r; + } + + @Override public void onLoad(Run r) { + this.owner = (AbstractBuild) r; + } + /** * Gets the number of failed tests. */ diff --git a/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java b/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java index 91d97ac64d..877cc0af6d 100644 --- a/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java +++ b/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java @@ -67,10 +67,14 @@ public abstract class AggregatedTestResultAction extends AbstractTestResultActio */ public final List children = new ArrayList(); + @Deprecated public AggregatedTestResultAction(AbstractBuild owner) { super(owner); } + /** @since 1.544 */ + public AggregatedTestResultAction() {} + protected void update(List children) { failCount = skipCount = totalCount = 0; this.children.clear(); diff --git a/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java b/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java index 2b4bd00174..709908d688 100644 --- a/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java +++ b/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java @@ -87,7 +87,7 @@ public class AggregatedTestResultPublisher extends Recorder { public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { // add a TestResult just so that it can show up later. - build.addAction(new TestResultAction(jobs,includeFailedBuilds,build)); + build.addAction(new TestResultAction(jobs, includeFailedBuilds)); return true; } @@ -131,6 +131,11 @@ public class AggregatedTestResultPublisher extends Recorder { private transient List didntRun; private transient List noFingerprints; + public TestResultAction(String jobs, boolean includeFailedBuilds) { + this(jobs, includeFailedBuilds, null); + } + + @Deprecated public TestResultAction(String jobs, boolean includeFailedBuilds, AbstractBuild owner) { super(owner); this.includeFailedBuilds = includeFailedBuilds; diff --git a/core/src/main/java/hudson/tasks/test/MatrixTestResult.java b/core/src/main/java/hudson/tasks/test/MatrixTestResult.java index 5f6fa77c8c..d023fc9a6c 100644 --- a/core/src/main/java/hudson/tasks/test/MatrixTestResult.java +++ b/core/src/main/java/hudson/tasks/test/MatrixTestResult.java @@ -38,10 +38,15 @@ import hudson.model.Action; * @author Kohsuke Kawaguchi */ public class MatrixTestResult extends AggregatedTestResultAction { + + @Deprecated public MatrixTestResult(MatrixBuild owner) { super(owner); } + /** @since 1.544 */ + public MatrixTestResult() {} + /** * Use the configuration name. */ diff --git a/core/src/main/java/hudson/tasks/test/TestResultAggregator.java b/core/src/main/java/hudson/tasks/test/TestResultAggregator.java index 22d90b9134..72b76fd708 100644 --- a/core/src/main/java/hudson/tasks/test/TestResultAggregator.java +++ b/core/src/main/java/hudson/tasks/test/TestResultAggregator.java @@ -46,7 +46,7 @@ public class TestResultAggregator extends MatrixAggregator { @Override public boolean startBuild() throws InterruptedException, IOException { - result = new MatrixTestResult(build); + result = new MatrixTestResult(); build.addAction(result); return true; } diff --git a/test/src/test/java/hudson/tasks/test/TrivialTestResultAction.java b/test/src/test/java/hudson/tasks/test/TrivialTestResultAction.java index efa33f76de..993c05bf44 100644 --- a/test/src/test/java/hudson/tasks/test/TrivialTestResultAction.java +++ b/test/src/test/java/hudson/tasks/test/TrivialTestResultAction.java @@ -32,12 +32,19 @@ import org.kohsuke.stapler.StaplerProxy; public class TrivialTestResultAction extends AbstractTestResultAction implements StaplerProxy { protected TrivialTestResult result; + + @Deprecated protected TrivialTestResultAction(AbstractBuild owner, TrivialTestResult result) { super(owner); this.result = result; this.result.setParentAction(this); } + /** @since 1.544 */ + protected TrivialTestResultAction(TrivialTestResult result) { + this(null, result); + } + /** * Gets the number of failed tests. */ diff --git a/test/src/test/java/hudson/tasks/test/TrivialTestResultRecorder.java b/test/src/test/java/hudson/tasks/test/TrivialTestResultRecorder.java index 3958f1a340..aaa272bb10 100644 --- a/test/src/test/java/hudson/tasks/test/TrivialTestResultRecorder.java +++ b/test/src/test/java/hudson/tasks/test/TrivialTestResultRecorder.java @@ -48,9 +48,9 @@ public class TrivialTestResultRecorder extends Recorder implements Serializable System.out.println("performing TrviialTestResultRecorder"); listener.getLogger().println("perfoming TrivialTestResultRecorder"); TrivialTestResult r = new TrivialTestResult("gubernatorial"); - TrivialTestResultAction action = new TrivialTestResultAction(build, r); + TrivialTestResultAction action = new TrivialTestResultAction(r); r.setParentAction(action); - build.getActions().add(action); + build.addAction(action); listener.getLogger().println("done with TrivialTestResultRecorder"); System.out.println("done with TrivialTestResultRecorder"); return true; -- GitLab From a58e198f8aa60dd0cb244cba338d9c48141590e5 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 10 Dec 2013 18:50:33 -0500 Subject: [PATCH 0556/1630] [FIXED JENKINS-20951] XmlFile.read/unmarshal needs to catch general XStreamException so as to include CannotResolveClassException, thrown when a TopLevelItem provided by a plugin is unloadable. --- changelog.html | 3 ++ core/src/main/java/hudson/XmlFile.java | 10 ++-- .../java/hudson/model/ItemGroupMixIn.java | 4 +- .../org/jvnet/hudson/test/MockFolder.java | 3 ++ .../java/hudson/model/ItemGroupMixInTest.java | 50 ++++++++++++++++++ ...xmlFileReadCannotResolveClassException.zip | Bin 0 -> 1390 bytes 6 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 test/src/test/java/hudson/model/ItemGroupMixInTest.java create mode 100644 test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadCannotResolveClassException.zip diff --git a/changelog.html b/changelog.html index 58ccb7ea64..ca68e9c0ac 100644 --- a/changelog.html +++ b/changelog.html @@ -76,6 +76,9 @@ Upcoming changes
  • Error page should be visible even if the anonymous user does not have overall/read access. (issue 20866) +
  • + CannotResolveClassException breaks loading of entire containing folder, not just one job. + (issue 20951)
  • JavaScript errors when navigating away from a page with a build timeline widget while the timeline is loading. (pull request 1041) diff --git a/core/src/main/java/hudson/XmlFile.java b/core/src/main/java/hudson/XmlFile.java index 148578c469..00eae060e9 100644 --- a/core/src/main/java/hudson/XmlFile.java +++ b/core/src/main/java/hudson/XmlFile.java @@ -24,7 +24,7 @@ package hudson; import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.converters.ConversionException; +import com.thoughtworks.xstream.XStreamException; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.io.StreamException; @@ -140,9 +140,7 @@ public final class XmlFile { InputStream in = new BufferedInputStream(new FileInputStream(file)); try { return xs.fromXML(in); - } catch(StreamException e) { - throw new IOException("Unable to read "+file,e); - } catch(ConversionException e) { + } catch (XStreamException e) { throw new IOException("Unable to read "+file,e); } catch(Error e) {// mostly reflection errors throw new IOException("Unable to read "+file,e); @@ -163,9 +161,7 @@ public final class XmlFile { try { // TODO: expose XStream the driver from XStream return xs.unmarshal(DEFAULT_DRIVER.createReader(in), o); - } catch (StreamException e) { - throw new IOException("Unable to read "+file,e); - } catch(ConversionException e) { + } catch (XStreamException e) { throw new IOException("Unable to read "+file,e); } catch(Error e) {// mostly reflection errors throw new IOException("Unable to read "+file,e); diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java index a91405c3a4..5c9bbab602 100644 --- a/core/src/main/java/hudson/model/ItemGroupMixIn.java +++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java @@ -40,6 +40,8 @@ import java.io.FileFilter; import java.io.IOException; import java.io.InputStream; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Defines a bunch of static methods to be used as a "mix-in" for {@link ItemGroup} @@ -99,7 +101,7 @@ public abstract class ItemGroupMixIn { V item = (V) Items.load(parent,subdir); configurations.put(key.call(item), item); } catch (IOException e) { - e.printStackTrace(); // TODO: logging + Logger.getLogger(ItemGroupMixIn.class.getName()).log(Level.WARNING, "could not load " + subdir, e); } } diff --git a/test/src/main/java/org/jvnet/hudson/test/MockFolder.java b/test/src/main/java/org/jvnet/hudson/test/MockFolder.java index cf4231c2e9..dec3e6243a 100644 --- a/test/src/main/java/org/jvnet/hudson/test/MockFolder.java +++ b/test/src/main/java/org/jvnet/hudson/test/MockFolder.java @@ -94,6 +94,9 @@ public class MockFolder extends AbstractItem implements ModifiableTopLevelItemGr } @Override public TopLevelItem getItem(String name) { + if (items == null) { + return null; // cf. parent hack in AbstractProject.onLoad + } return items.get(name); } diff --git a/test/src/test/java/hudson/model/ItemGroupMixInTest.java b/test/src/test/java/hudson/model/ItemGroupMixInTest.java new file mode 100644 index 0000000000..ddf14573db --- /dev/null +++ b/test/src/test/java/hudson/model/ItemGroupMixInTest.java @@ -0,0 +1,50 @@ +/* + * The MIT License + * + * Copyright 2013 Jesse Glick. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package hudson.model; + +import java.util.Collection; +import static org.junit.Assert.*; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Bug; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.MockFolder; +import org.jvnet.hudson.test.recipes.LocalData; + +public class ItemGroupMixInTest { + + @Rule public JenkinsRule r = new JenkinsRule(); + + @Bug(20951) + @LocalData + @Test public void xmlFileReadCannotResolveClassException() throws Exception { + MockFolder d = r.jenkins.getItemByFullName("d", MockFolder.class); + assertNotNull(d); + Collection items = d.getItems(); + assertEquals(1, items.size()); + assertEquals("valid", items.iterator().next().getName()); + } + +} diff --git a/test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadCannotResolveClassException.zip b/test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadCannotResolveClassException.zip new file mode 100644 index 0000000000000000000000000000000000000000..c5f4ba8211596f2ae57783c0b031d3268f4a99dd GIT binary patch literal 1390 zcmaiy&q@MO6vnTP_D6#uDoQHD@TuM19{7L8uQbcErhU;Zo}Mf+ zMSFZYet_`?S(ZqBDUA6q?f;Z7XjbF-mrfj&-70ID{xnRRv0wtO#$ z!XaLEZKtj_d)#o785VIDkHIW+sTN(ogOs3(Mo=BUvO1q~g#lI*#2ms_w+f*Tn1^5iq%A_a@FR(#mh| z%j;kjr!a*^3?mnZ8uoaL+kLKfEU#{I_0ToizWGG5piC?12FT*G!hTEm9ba5}R9B*) zRRk(rRvEP)pz!7Z7SS~dn=I}KmH^E2@JhhsB;v8*g32Dh1y*d0b)B(wxU4d92mJad zz36{}E`ZaBg2@4diz^2(jO3CmVidy7m7RYO1<_;h9?><~d$`52_wD3lCIOkakJL!d P!4 literal 0 HcmV?d00001 -- GitLab From c71a7d070da48a00d5c57f5c2b413dfec27c31aa Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 10 Dec 2013 16:57:12 -0800 Subject: [PATCH 0557/1630] [maven-release-plugin] prepare release jenkins-1.543 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- plugins/pom.xml | 8 ++++---- pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 7988fba3ca..b663df7468 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.543-SNAPSHOT + 1.543 cli diff --git a/core/pom.xml b/core/pom.xml index 40c56a5451..0b8144dc19 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.543-SNAPSHOT + 1.543 ../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 34803dc406..ab7b3bb732 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -11,7 +11,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.543-SNAPSHOT + 1.543 pom +

    What's new in 1.543 (2013/12/10)

    • HTML metacharacters not escaped in log messages. (issue 20800)
    -

    What's new in 1.542 (2013/12/02)

    • -- GitLab From 6db47326e1eb8fa5884783f63733399eb1aa9f53 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 10 Dec 2013 18:55:01 -0800 Subject: [PATCH 0560/1630] updated changelog as a part of the release --- debian/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/debian/changelog b/debian/debian/changelog index e07e824096..d4e063941f 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +jenkins (1.543) unstable; urgency=low + + * See http://jenkins-ci.org/changelog for more details. + + -- Kohsuke Kawaguchi Tue, 10 Dec 2013 18:12:44 -0800 + jenkins (1.542) unstable; urgency=low * See http://jenkins-ci.org/changelog for more details. -- GitLab From f6d5448eedb57a27a721a17c0603f2ba16345cae Mon Sep 17 00:00:00 2001 From: Chris Arnott Date: Wed, 11 Dec 2013 08:52:11 +0000 Subject: [PATCH 0561/1630] [JENKINS-11429] Add a column "Success" in test result table Added a column Pass (rather than success) to the tables in the junit plugin. --- .../hudson/tasks/test/MetaTabulatedResult/body.jelly | 6 ++++++ .../hudson/tasks/test/TrivialTestResult/body.jelly | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/body.jelly b/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/body.jelly index 9ca50c497d..6c141a1cec 100644 --- a/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/body.jelly +++ b/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/body.jelly @@ -57,6 +57,8 @@ THE SOFTWARE.
    • + + @@ -80,6 +82,10 @@ THE SOFTWARE. + + + + @@ -96,6 +98,10 @@ THE SOFTWARE. + +
    ${it.childTitle} ${%Duration}(${%diff}) ${%Skip} (${%diff})${%Pass}(${%diff}) ${%Total} (${%diff})
    ${h.getDiffString2(p.skipCount-prev.skipCount)} ${p.passCount} + ${h.getDiffString2(p.passCount-prev.passCount)} + ${p.totalCount} ${h.getDiffString2(p.totalCount-prev.totalCount)} diff --git a/test/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly b/test/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly index a1b51c9061..201940681c 100644 --- a/test/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly +++ b/test/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly @@ -73,6 +73,8 @@ THE SOFTWARE. (${%diff}) ${%Skip} (${%diff})${%Pass}(${%diff}) ${%Total} (${%diff})
    ${h.getDiffString2(p.skipCount-prev.skipCount)} ${p.passCount} + ${h.getDiffString2(p.passCount-prev.passCount)} + ${p.totalCount} ${h.getDiffString2(p.totalCount-prev.totalCount)} -- GitLab From 8fde2e18a3a6da843d7719844e1fdd737e652c74 Mon Sep 17 00:00:00 2001 From: ikedam Date: Thu, 12 Dec 2013 00:10:32 +0900 Subject: [PATCH 0562/1630] [JENKINS-19976] Tests for the behavior of loading a depended plugin dynamically. --- .../test/java/hudson/PluginManagerTest.java | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/test/src/test/java/hudson/PluginManagerTest.java b/test/src/test/java/hudson/PluginManagerTest.java index 6add26b107..ed0b50565d 100644 --- a/test/src/test/java/hudson/PluginManagerTest.java +++ b/test/src/test/java/hudson/PluginManagerTest.java @@ -41,6 +41,7 @@ import org.jvnet.hudson.test.recipes.WithPlugin; import org.jvnet.hudson.test.recipes.WithPluginManager; import java.io.File; +import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; import java.util.Collections; @@ -222,4 +223,104 @@ public class PluginManagerTest extends HudsonTestCase { // TODO required plugin installed but inactive } + // plugin "depender" optionally depends on plugin "dependee". + // they are written like this: + // dummy.comp.depender.Depender: + // public class Depender { + // public static String getValue() { + // if (Jenkins.getInstance().getPlugin("dependee") != null) { + // return Dependee.getValue(); + // } + // return "depender"; + // } + // } + // + // dummy.comp.dependee.Dependee: + // public class Dependee { + // public static String getValue() { + // return "dependee"; + // } + // } + + + /** + * call dummy.comp.depender.Depender.getValue(). + * + * @return + * @throws Exception + */ + private String callDependerValue() throws Exception { + Class c = jenkins.getPluginManager().uberClassLoader.loadClass("dummy.comp.depender.Depender"); + Method m = c.getMethod("getValue"); + return (String)m.invoke(null); + } + + /** + * Load "dependee" and then load "depender". + * Asserts that "depender" can access to "dependee". + * + * @throws Exception + */ + public void testInstallDependingPluginWithoutRestart() throws Exception { + // Load dependee. + { + String target = "dependee.hpi"; + URL src = getClass().getClassLoader().getResource(String.format("plugins/%s", target)); + File dest = new File(jenkins.getRootDir(), String.format("plugins/%s", target)); + FileUtils.copyURLToFile(src, dest); + jenkins.pluginManager.dynamicLoad(dest); + } + + // before load depender, failed to call Depender.getValue() + try { + callDependerValue(); + fail(); + } catch( Exception e ) { + } + + // Load depender. + { + String target = "depender.hpi"; + URL src = getClass().getClassLoader().getResource(String.format("plugins/%s", target)); + File dest = new File(jenkins.getRootDir(), String.format("plugins/%s", target)); + FileUtils.copyURLToFile(src, dest); + jenkins.pluginManager.dynamicLoad(dest); + } + + // depender successfully access to dependee. + assertEquals("dependee", callDependerValue()); + } + + /** + * Load "depender" and then load "dependee". + * Asserts that "depender" can access to "dependee". + * + * @throws Exception + */ + public void testInstallDependedPluginWithoutRestart() throws Exception { + // Load depender. + { + String target = "depender.hpi"; + URL src = getClass().getClassLoader().getResource(String.format("plugins/%s", target)); + File dest = new File(jenkins.getRootDir(), String.format("plugins/%s", target)); + FileUtils.copyURLToFile(src, dest); + jenkins.pluginManager.dynamicLoad(dest); + } + + // before load dependee, depender does not access to dependee. + assertEquals("depender", callDependerValue()); + + // Load dependee. + { + String target = "dependee.hpi"; + URL src = getClass().getClassLoader().getResource(String.format("plugins/%s", target)); + File dest = new File(jenkins.getRootDir(), String.format("plugins/%s", target)); + FileUtils.copyURLToFile(src, dest); + jenkins.pluginManager.dynamicLoad(dest); + } + + // depender successfully access to dependee. + assertEquals("dependee", callDependerValue()); + } + } -- GitLab From a1cd8c73fdd29282b08e31d454819976cdf3612d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 11 Dec 2013 07:53:30 -0800 Subject: [PATCH 0563/1630] creating an RC branch --- changelog.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index 66bade5da9..1bb9a8af3a 100644 --- a/changelog.html +++ b/changelog.html @@ -54,6 +54,14 @@ Upcoming changes + + + - - -

    What's new in 1.543 (2013/12/10)

      -- GitLab From cf396b0f9ad234d070341fc6ee87afa2283b81ca Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 11 Dec 2013 07:53:34 -0800 Subject: [PATCH 0564/1630] the trunk is toward 1.545-SNAPSHOT --- cli/pom.xml | 2 +- core/pom.xml | 2 +- plugins/pom.xml | 8 ++++---- pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index d0bf4ce3a2..6328a2d6af 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.544-SNAPSHOT + 1.545-SNAPSHOT cli diff --git a/core/pom.xml b/core/pom.xml index 9ce0208877..adae6bbacb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.544-SNAPSHOT + 1.545-SNAPSHOT ../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 488f37d662..fd0e915227 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -11,7 +11,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.544-SNAPSHOT + 1.545-SNAPSHOT pom @@ -69,9 +74,6 @@ Upcoming changes
    • Hudson shows 0GB free space when space available drops below 1GB. (issue 7776) -
    • - Avoiding serializing the owning build as part of a test result action, as this can lead to errors later. - (issue 18410)
    • Added filter field for installed plugins tab. (issue 20219) @@ -84,9 +86,6 @@ Upcoming changes
    • Error page should be visible even if the anonymous user does not have overall/read access. (issue 20866) -
    • - CannotResolveClassException breaks loading of entire containing folder, not just one job. - (issue 20951)
    • JavaScript errors when navigating away from a page with a build timeline widget while the timeline is loading. (pull request 1041) diff --git a/core/src/main/java/hudson/tasks/junit/TestResultAction.java b/core/src/main/java/hudson/tasks/junit/TestResultAction.java index 4c48e1b74b..318246d710 100644 --- a/core/src/main/java/hudson/tasks/junit/TestResultAction.java +++ b/core/src/main/java/hudson/tasks/junit/TestResultAction.java @@ -68,7 +68,7 @@ public class TestResultAction extends AbstractTestResultAction setResult(result, listener); } - /** @since 1.544 */ + /** @since 1.545 */ public TestResultAction(TestResult result, BuildListener listener) { this(null, result, listener); } diff --git a/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java b/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java index 925e0fb99b..fa89a51ebb 100644 --- a/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java +++ b/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java @@ -67,7 +67,7 @@ public abstract class AbstractTestResultAction descriptions = new ConcurrentHashMap(); - /** @since 1.544 */ + /** @since 1.545 */ protected AbstractTestResultAction() {} /** @deprecated Use the default constructor and just call {@link Run#addAction} to associate the build with the action. */ diff --git a/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java b/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java index 877cc0af6d..549fca2eb4 100644 --- a/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java +++ b/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java @@ -72,7 +72,7 @@ public abstract class AggregatedTestResultAction extends AbstractTestResultActio super(owner); } - /** @since 1.544 */ + /** @since 1.545 */ public AggregatedTestResultAction() {} protected void update(List children) { diff --git a/core/src/main/java/hudson/tasks/test/MatrixTestResult.java b/core/src/main/java/hudson/tasks/test/MatrixTestResult.java index d023fc9a6c..6d2122a3cd 100644 --- a/core/src/main/java/hudson/tasks/test/MatrixTestResult.java +++ b/core/src/main/java/hudson/tasks/test/MatrixTestResult.java @@ -44,7 +44,7 @@ public class MatrixTestResult extends AggregatedTestResultAction { super(owner); } - /** @since 1.544 */ + /** @since 1.545 */ public MatrixTestResult() {} /** diff --git a/test/src/test/java/hudson/tasks/test/TrivialTestResultAction.java b/test/src/test/java/hudson/tasks/test/TrivialTestResultAction.java index 993c05bf44..f51f50d24d 100644 --- a/test/src/test/java/hudson/tasks/test/TrivialTestResultAction.java +++ b/test/src/test/java/hudson/tasks/test/TrivialTestResultAction.java @@ -40,7 +40,7 @@ public class TrivialTestResultAction extends AbstractTestResultAction Date: Wed, 11 Dec 2013 17:09:45 -0500 Subject: [PATCH 0566/1630] [FIXED JENKINS-18224] Introduced TransientActionFactory. --- .../DefaultMatrixExecutionStrategyImpl.java | 3 +- .../main/java/hudson/model/AbstractBuild.java | 3 +- .../java/hudson/model/AbstractProject.java | 8 +-- .../main/java/hudson/model/Actionable.java | 66 +++++++++++-------- core/src/main/java/hudson/model/Computer.java | 2 +- core/src/main/java/hudson/model/Job.java | 7 +- core/src/main/java/hudson/model/Queue.java | 15 ++--- core/src/main/java/hudson/model/Run.java | 20 ++---- .../model/TransientBuildActionFactory.java | 4 +- .../model/TransientComputerActionFactory.java | 2 + .../model/TransientProjectActionFactory.java | 2 + .../hudson/model/queue/WorkUnitContext.java | 2 +- .../model/ModelObjectWithContextMenu.java | 2 +- .../jenkins/model/TransientActionFactory.java | 55 ++++++++++++++++ .../hudson/matrix/MatrixProject/index.jelly | 2 +- .../hudson/model/AbstractBuild/index.jelly | 2 +- .../hudson/model/AbstractProject/main.jelly | 4 +- .../main/resources/lib/hudson/actions.jelly | 4 +- .../project/projectActionFloatingBox.jelly | 2 +- .../model/TransientActionFactoryTest.java | 64 ++++++++++++++++++ 20 files changed, 193 insertions(+), 76 deletions(-) create mode 100644 core/src/main/java/jenkins/model/TransientActionFactory.java create mode 100644 test/src/test/java/jenkins/model/TransientActionFactoryTest.java diff --git a/core/src/main/java/hudson/matrix/DefaultMatrixExecutionStrategyImpl.java b/core/src/main/java/hudson/matrix/DefaultMatrixExecutionStrategyImpl.java index 6b19c6a39e..c874a35963 100644 --- a/core/src/main/java/hudson/matrix/DefaultMatrixExecutionStrategyImpl.java +++ b/core/src/main/java/hudson/matrix/DefaultMatrixExecutionStrategyImpl.java @@ -3,7 +3,6 @@ package hudson.matrix; import groovy.lang.GroovyRuntimeException; import hudson.AbortException; import hudson.Extension; -import hudson.Util; import hudson.console.ModelHyperlinkNote; import hudson.matrix.MatrixBuild.MatrixBuildExecution; import hudson.matrix.listeners.MatrixBuildListener; @@ -238,7 +237,7 @@ public class DefaultMatrixExecutionStrategyImpl extends MatrixExecutionStrategy exec.getListener().getLogger().println(Messages.MatrixBuild_Triggering(ModelHyperlinkNote.encodeTo(c))); // filter the parent actions for those that can be passed to the individual jobs. - List childActions = Util.filter(build.getActions(), MatrixChildAction.class); + List childActions = build.getActions(MatrixChildAction.class); c.scheduleBuild(childActions, new UpstreamCause((Run)build)); } diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index bbbc44ad62..69ad1aeea4 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -30,7 +30,6 @@ import hudson.EnvVars; import hudson.FilePath; import hudson.Functions; import hudson.Launcher; -import hudson.Util; import hudson.console.AnnotatedLargeText; import hudson.console.ExpandableDetailsNote; import hudson.console.ModelHyperlinkNote; @@ -922,7 +921,7 @@ public abstract class AbstractBuild

      ,R extends Abs for (Environment e : buildEnvironments) e.buildEnvVars(env); - for (EnvironmentContributingAction a : Util.filter(getActions(),EnvironmentContributingAction.class)) + for (EnvironmentContributingAction a : getActions(EnvironmentContributingAction.class)) a.buildEnvVars(this,env); EnvVars.resolve(env); diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index a214b4ffee..4579eb39fa 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -776,13 +776,7 @@ public abstract class AbstractProject

      ,R extends A } public List getProminentActions() { - List a = getActions(); - List pa = new Vector(); - for (Action action : a) { - if(action instanceof ProminentProjectAction) - pa.add((ProminentProjectAction) action); - } - return pa; + return getActions(ProminentProjectAction.class); } @Override diff --git a/core/src/main/java/hudson/model/Actionable.java b/core/src/main/java/hudson/model/Actionable.java index 01403838c0..f3e4dc2cc3 100644 --- a/core/src/main/java/hudson/model/Actionable.java +++ b/core/src/main/java/hudson/model/Actionable.java @@ -23,27 +23,19 @@ */ package hudson.model; -import hudson.Functions; -import hudson.model.queue.Tasks; +import hudson.Util; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import jenkins.model.Jenkins; import jenkins.model.ModelObjectWithContextMenu; -import org.apache.commons.jelly.JellyContext; -import org.apache.commons.jelly.JellyException; -import org.apache.commons.jelly.JellyTagException; -import org.apache.commons.jelly.Script; -import org.apache.commons.jelly.XMLOutput; +import jenkins.model.TransientActionFactory; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.WebApp; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; -import org.kohsuke.stapler.jelly.JellyClassTearOff; -import org.kohsuke.stapler.jelly.JellyFacet; -import org.xml.sax.helpers.DefaultHandler; - -import java.util.ArrayList; -import java.util.List; -import java.util.Vector; -import java.util.concurrent.CopyOnWriteArrayList; /** * {@link ModelObject} that can have additional {@link Action}s. @@ -60,15 +52,19 @@ public abstract class Actionable extends AbstractModelObject implements ModelObj private volatile CopyOnWriteArrayList actions; /** - * Gets actions contributed to this build. + * Gets actions contributed to this object. * *

      * A new {@link Action} can be added by {@code getActions().add(...)}. * + *

      If you are reading the list, rather than modifying it, + * use {@link #getAllActions} instead. + * This method by default returns only persistent actions + * (though some subclasses override it to return an extended unmodifiable list). + * * @return * may be empty but never null. */ - @Exported public List getActions() { if(actions == null) { synchronized (this) { @@ -81,7 +77,27 @@ public abstract class Actionable extends AbstractModelObject implements ModelObj } /** - * Gets all actions of a specified type that contributed to this build. + * Gets all actions, transient or persistent. + * {@link #getActions} is supplemented with anything contributed by {@link TransientActionFactory}. + * @return an unmodifiable, possible empty list + * @since TODO + */ + @Exported(name="actions") + public final List getAllActions() { + List _actions = new ArrayList(getActions()); + for (TransientActionFactory taf : Jenkins.getInstance().getExtensionList(TransientActionFactory.class)) { + if (taf.type().isInstance(this)) { + _actions.addAll(createFor(taf)); + } + } + return Collections.unmodifiableList(_actions); + } + private Collection createFor(TransientActionFactory taf) { + return taf.createFor(taf.type().cast(this)); + } + + /** + * Gets all actions of a specified type that contributed to this object. * * @param type The type of action to return. * @return @@ -89,11 +105,7 @@ public abstract class Actionable extends AbstractModelObject implements ModelObj * @see #getAction(Class) */ public List getActions(Class type) { - List result = new Vector(); - for (Action a : getActions()) - if (type.isInstance(a)) - result.add(type.cast(a)); - return result; + return Util.filter(getAllActions(), type); } /** @@ -106,6 +118,8 @@ public abstract class Actionable extends AbstractModelObject implements ModelObj getActions().add(a); } + /** @deprecated No clear purpose, since subclasses may have overridden {@link #getActions}, and does not consider {@link TransientActionFactory}. */ + @Deprecated public Action getAction(int index) { if(actions==null) return null; return actions.get(index); @@ -119,14 +133,14 @@ public abstract class Actionable extends AbstractModelObject implements ModelObj * @see #getActions(Class) */ public T getAction(Class type) { - for (Action a : getActions()) + for (Action a : getAllActions()) if (type.isInstance(a)) return type.cast(a); return null; } public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) { - for (Action a : getActions()) { + for (Action a : getAllActions()) { if(a==null) continue; // be defensive String urlName = a.getUrlName(); diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java index 219373d5ff..4897b43ed9 100644 --- a/core/src/main/java/hudson/model/Computer.java +++ b/core/src/main/java/hudson/model/Computer.java @@ -189,7 +189,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces } result.addAll(transientActions); } - return result; + return Collections.unmodifiableList(result); } @Override diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 29a7cd9425..6eeecdd09e 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -972,11 +972,8 @@ public abstract class Job, RunT extends Run(item.getAllActions()))); } if(!shouldScheduleItem) { duplicatesInQueue.add(item); @@ -1417,7 +1417,7 @@ public class Queue extends ResourceController implements Saveable { } protected Item(Item item) { - this(item.task, item.getActions(), item.id, item.future, item.inQueueSince); + this(item.task, new ArrayList(item.getAllActions()), item.id, item.future, item.inQueueSince); } /** @@ -1453,13 +1453,10 @@ public class Queue extends ResourceController implements Saveable { @Exported public String getParams() { StringBuilder s = new StringBuilder(); - for(Action action : getActions()) { - if(action instanceof ParametersAction) { - ParametersAction pa = (ParametersAction)action; - for (ParameterValue p : pa.getParameters()) { - s.append('\n').append(p.getShortDescription()); - } - } + for (ParametersAction pa : getActions(ParametersAction.class)) { + for (ParameterValue p : pa.getParameters()) { + s.append('\n').append(p.getShortDescription()); + } } return s.toString(); } diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index 7354640750..baffced4b0 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -332,7 +332,7 @@ public abstract class Run ,RunT extends Run,RunT extends Run getTransientActions() { List actions = new ArrayList(); for (TransientBuildActionFactory factory: TransientBuildActionFactory.all()) { @@ -443,21 +445,11 @@ public abstract class Run ,RunT extends Run getBadgeActions() { - List r = null; - for (Action a : getActions()) { - if(a instanceof BuildBadgeAction) { - if(r==null) - r = new ArrayList(); - r.add((BuildBadgeAction)a); - } - } + List r = getActions(BuildBadgeAction.class); if(isKeepLog()) { - if(r==null) - r = new ArrayList(); r.add(new KeepLogBuildBadge()); } - if(r==null) return Collections.emptyList(); - else return r; + return r; } /** @@ -1389,7 +1381,7 @@ public abstract class Run ,RunT extends Run(item.getAllActions()); // +1 for the main task int workUnitSize = Tasks.getSubTasksOf(task).size(); diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java index 0e1e315b26..dfc05d6692 100644 --- a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java +++ b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java @@ -214,7 +214,7 @@ public interface ModelObjectWithContextMenu extends ModelObject { } else if (self instanceof Actionable) { // fallback - this.addAll(((Actionable)self).getActions()); + this.addAll(((Actionable)self).getAllActions()); } return this; diff --git a/core/src/main/java/jenkins/model/TransientActionFactory.java b/core/src/main/java/jenkins/model/TransientActionFactory.java new file mode 100644 index 0000000000..5b3572c1c2 --- /dev/null +++ b/core/src/main/java/jenkins/model/TransientActionFactory.java @@ -0,0 +1,55 @@ +/* + * The MIT License + * + * Copyright 2013 Jesse Glick. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package jenkins.model; + +import hudson.model.Action; +import hudson.model.Actionable; +import java.util.Collection; +import javax.annotation.Nonnull; + +/** + * Allows you to add actions to any kind of {@link Actionable} at once. + * @see Actionable#getAllActions + * @since TODO + */ +public abstract class TransientActionFactory { + + /** + * The type of object this factory cares about. + * Declared separately, rather than by having {@link #createFor} do a check-cast, + * so that method bodies are not loaded until actually needed. + * @return the type of {@link T} + */ + public abstract Class type(); + + /** + * Creates actions for a given object. + * This may be called frequently for the same object, so if your implementation is expensive, do your own caching. + * @param target an actionable object + * @return a possible empty set of actions + */ + public abstract @Nonnull Collection createFor(@Nonnull T target); + +} diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly index d182efb6b1..10e44ced6c 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly +++ b/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly @@ -52,7 +52,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index.jelly b/core/src/main/resources/hudson/model/AbstractBuild/index.jelly index 1174e9fb45..092907fc60 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/index.jelly +++ b/core/src/main/resources/hudson/model/AbstractBuild/index.jelly @@ -108,7 +108,7 @@ THE SOFTWARE. - +

    diff --git a/core/src/main/resources/hudson/model/AbstractProject/main.jelly b/core/src/main/resources/hudson/model/AbstractProject/main.jelly index 8400f08519..0fa59f0c84 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/main.jelly +++ b/core/src/main/resources/hudson/model/AbstractProject/main.jelly @@ -61,7 +61,7 @@ THE SOFTWARE. - + @@ -75,7 +75,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/lib/hudson/actions.jelly b/core/src/main/resources/lib/hudson/actions.jelly index 41f36b1e56..8fda764212 100644 --- a/core/src/main/resources/lib/hudson/actions.jelly +++ b/core/src/main/resources/lib/hudson/actions.jelly @@ -28,10 +28,10 @@ THE SOFTWARE. Shows a list of tasks. - List of actions. Defaults to "it.actions" + List of actions. Defaults to "it.allActions" - + +

    What's new in 1.544 (2013/12/15)

    • RingBufferLogHandler throws ArrayIndexOutOfBoundsException after int-overflow. @@ -85,7 +88,6 @@ Upcoming changes JavaScript errors when navigating away from a page with a build timeline widget while the timeline is loading. (pull request 1041)
    -

    What's new in 1.543 (2013/12/10)

    • -- GitLab From c9432bda978ef9e510b2fda19d04c110b2212943 Mon Sep 17 00:00:00 2001 From: olivierlemasle Date: Sun, 15 Dec 2013 16:35:34 +0100 Subject: [PATCH 0586/1630] Fix french translation --- .../PluginManager/advanced_fr.properties | 6 ++--- .../MatrixProject/ajaxMatrix_fr.properties | 2 +- .../configure-common_fr.properties | 2 -- .../model/AbstractItem/delete_fr.properties | 2 +- .../hudson/model/View/sidepanel_fr.properties | 4 ++-- .../config-assignedLabel_fr.properties | 24 +++++++++++++++++++ 6 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 core/src/main/resources/lib/hudson/project/config-assignedLabel_fr.properties diff --git a/core/src/main/resources/hudson/PluginManager/advanced_fr.properties b/core/src/main/resources/hudson/PluginManager/advanced_fr.properties index c27841534d..18e75bbbd8 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced_fr.properties +++ b/core/src/main/resources/hudson/PluginManager/advanced_fr.properties @@ -24,13 +24,13 @@ HTTP\ Proxy\ Configuration=Configuration du proxy HTTP Submit=Soumettre Upload\ Plugin=Soumettre un plugin File=Fichier -Update\ Site=Rafra\u00EEchir site +Update\ Site=Site de mise \u00E0 jour Upload=Soumettre lastUpdated=Derni\u00E8re mise \u00E0 jour\u00A0: il y a {0} -Check\ now=Vrifier maintenant +Check\ now=V\u00E9rifier maintenant uploadtext=Vous pouvez t\u00E9l\u00E9verser un fichier .hpi pour installer un plugin ext\u00E9rieur au d\u00E9p\u00F4t centralis\u00E9 de plugin. Proxy\ Needs\ Authorization=Le proxy n\u00E9cessite une authentification Server=Serveur User\ name=Nom d''utilisateur -No\ Proxy\ for=Pas de proxy pour +No\ Proxy\ Host=Pas de proxy pour Password=Mot de passe diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_fr.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_fr.properties index 2eb98346cc..d973d5dab9 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_fr.properties +++ b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_fr.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Not\ configured=Non configuree +Not\ configured=Non configur\u00E9e diff --git a/core/src/main/resources/hudson/model/AbstractItem/configure-common_fr.properties b/core/src/main/resources/hudson/model/AbstractItem/configure-common_fr.properties index 676b9ee7c6..6c32876b4e 100644 --- a/core/src/main/resources/hudson/model/AbstractItem/configure-common_fr.properties +++ b/core/src/main/resources/hudson/model/AbstractItem/configure-common_fr.properties @@ -21,9 +21,7 @@ # THE SOFTWARE. Advanced\ Project\ Options=Options avanc\u00E9es du projet -Restrict\ where\ this\ project\ can\ be\ run=Restreindre o\u00F9 le projet peut \u00EAtre ex\u00E9cuter Tie\ this\ project\ to\ a\ node=Associer ce projet \u00E0 un noeud Node=Noeud -Execute\ concurrent\ builds\ if\ necessary\ =Ex\u00E9cuter les builds en parall\u00E8le si n\u00E9cessaire JDK\ to\ be\ used\ for\ this\ project=Le JDK \u00E0 utiliser pour ce projet default.value=(Valeur par d\u00E9faut) diff --git a/core/src/main/resources/hudson/model/AbstractItem/delete_fr.properties b/core/src/main/resources/hudson/model/AbstractItem/delete_fr.properties index 43bbfcd4a8..2b290a25c3 100644 --- a/core/src/main/resources/hudson/model/AbstractItem/delete_fr.properties +++ b/core/src/main/resources/hudson/model/AbstractItem/delete_fr.properties @@ -22,4 +22,4 @@ Are\ you\ sure\ about\ deleting\ the\ job?=Etes-vous sr de vouloir supprimer ce job? Yes=Oui -blurb=\u00CAtes vous s\u00FBr de vouloir supprimer ce {0} "{1}"? +blurb=\u00CAtes-vous s\u00FBr de vouloir supprimer ce {0} "{1}"? \ No newline at end of file diff --git a/core/src/main/resources/hudson/model/View/sidepanel_fr.properties b/core/src/main/resources/hudson/model/View/sidepanel_fr.properties index 89ccb9debd..ac09421cf1 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_fr.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_fr.properties @@ -20,8 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -NewJob=Nouvelle {0} -People=Utilsateurs +NewJob=Nouveau {0} +People=Utilisateurs Build\ History=Historique des constructions Edit\ View=\u00C9diter cette vue Delete\ View=Supprimer cette vue diff --git a/core/src/main/resources/lib/hudson/project/config-assignedLabel_fr.properties b/core/src/main/resources/lib/hudson/project/config-assignedLabel_fr.properties new file mode 100644 index 0000000000..c0ec0f1dc0 --- /dev/null +++ b/core/src/main/resources/lib/hudson/project/config-assignedLabel_fr.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Restrict\ where\ this\ project\ can\ be\ run=Restreindre o\u00F9 le projet peut \u00EAtre ex\u00E9cut\u00E9 +Label\ Expression=Expression -- GitLab From 0d373fa3724ace25154a07f81589bcab2877daef Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 15 Dec 2013 08:59:28 -0800 Subject: [PATCH 0587/1630] updated changelog as a part of the release --- debian/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/debian/changelog b/debian/debian/changelog index d4e063941f..2282db70a2 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +jenkins (1.544) unstable; urgency=low + + * See http://jenkins-ci.org/changelog for more details. + + -- Kohsuke Kawaguchi Sun, 15 Dec 2013 07:15:04 -0800 + jenkins (1.543) unstable; urgency=low * See http://jenkins-ci.org/changelog for more details. -- GitLab From c3508113f0e1659f0e6c1064f31cb2ac1caa2ef3 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 16 Dec 2013 15:03:07 -0500 Subject: [PATCH 0588/1630] =?UTF-8?q?[FIXED=20JENKINS-21024]=20Catch=20a?= =?UTF-8?q?=20full=20range=20of=20XStreamException=E2=80=99s=20during=20de?= =?UTF-8?q?serialization,=20including=20rethrown=20exceptions=20from=20rea?= =?UTF-8?q?dResolve.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.html | 3 + .../java/hudson/util/CopyOnWriteList.java | 9 +-- .../util/RobustCollectionConverter.java | 11 +--- .../util/RobustReflectionConverter.java | 11 +--- .../util/xstream/ImmutableListConverter.java | 4 +- .../groovy/hudson/model/RunMapTest.groovy | 6 +- .../util/RobustReflectionConverterTest.java | 56 ++++++++++++++++++ .../randomExceptionsReported.zip | Bin 0 -> 276 bytes 8 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 test/src/test/java/hudson/util/RobustReflectionConverterTest.java create mode 100644 test/src/test/resources/hudson/util/RobustReflectionConverterTest/randomExceptionsReported.zip diff --git a/changelog.html b/changelog.html index 6091481ff4..e20c5644f6 100644 --- a/changelog.html +++ b/changelog.html @@ -58,6 +58,9 @@ Upcoming changes
    • CannotResolveClassException breaks loading of entire containing folder, not just one job. (issue 20951) +
    • + Better robustness against XML deserialization errors. + (issue 21024)
    • Avoiding serializing the owning build as part of a test result action, as this can lead to errors later. (issue 18410) diff --git a/core/src/main/java/hudson/util/CopyOnWriteList.java b/core/src/main/java/hudson/util/CopyOnWriteList.java index a6e7372b8b..bf66360658 100644 --- a/core/src/main/java/hudson/util/CopyOnWriteList.java +++ b/core/src/main/java/hudson/util/CopyOnWriteList.java @@ -23,7 +23,7 @@ */ package hudson.util; -import com.thoughtworks.xstream.mapper.CannotResolveClassException; +import com.thoughtworks.xstream.XStreamException; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.converters.UnmarshallingContext; @@ -38,8 +38,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Arrays; -import static java.util.logging.Level.FINE; -import java.util.logging.Logger; /** @@ -192,11 +190,9 @@ public class CopyOnWriteList implements Iterable { try { Object item = readItem(reader, context, items); items.add(item); - } catch (CannotResolveClassException e) { - LOGGER.log(FINE, "Failed to resolve class", e); + } catch (XStreamException e) { RobustReflectionConverter.addErrorInContext(context, e); } catch (LinkageError e) { - LOGGER.log(FINE, "Failed to resolve class", e); RobustReflectionConverter.addErrorInContext(context, e); } reader.moveUp(); @@ -206,5 +202,4 @@ public class CopyOnWriteList implements Iterable { } } - private static final Logger LOGGER = Logger.getLogger(CopyOnWriteList.class.getName()); } diff --git a/core/src/main/java/hudson/util/RobustCollectionConverter.java b/core/src/main/java/hudson/util/RobustCollectionConverter.java index 86e1de7b21..78dc2b2f2f 100644 --- a/core/src/main/java/hudson/util/RobustCollectionConverter.java +++ b/core/src/main/java/hudson/util/RobustCollectionConverter.java @@ -23,7 +23,6 @@ */ package hudson.util; -import com.thoughtworks.xstream.mapper.CannotResolveClassException; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.converters.collections.CollectionConverter; import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; @@ -31,16 +30,15 @@ import com.thoughtworks.xstream.converters.reflection.SerializableConverter; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.mapper.Mapper; import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.XStreamException; import java.util.Collection; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; -import static java.util.logging.Level.FINE; -import java.util.logging.Logger; /** - * {@link CollectionConverter} that ignores {@link CannotResolveClassException}. + * {@link CollectionConverter} that ignores {@link XStreamException}. * *

      * This allows Hudson to load XML files that contain non-existent classes @@ -84,16 +82,13 @@ public class RobustCollectionConverter extends CollectionConverter { try { Object item = readItem(reader, context, collection); collection.add(item); - } catch (CannotResolveClassException e) { - LOGGER.log(FINE, "Failed to resolve class", e); + } catch (XStreamException e) { RobustReflectionConverter.addErrorInContext(context, e); } catch (LinkageError e) { - LOGGER.log(FINE, "Failed to resolve class", e); RobustReflectionConverter.addErrorInContext(context, e); } reader.moveUp(); } } - private static final Logger LOGGER = Logger.getLogger(RobustCollectionConverter.class.getName()); } diff --git a/core/src/main/java/hudson/util/RobustReflectionConverter.java b/core/src/main/java/hudson/util/RobustReflectionConverter.java index 99cd902d5a..0be434f1de 100755 --- a/core/src/main/java/hudson/util/RobustReflectionConverter.java +++ b/core/src/main/java/hudson/util/RobustReflectionConverter.java @@ -23,12 +23,12 @@ */ package hudson.util; +import com.thoughtworks.xstream.XStreamException; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.converters.SingleValueConverter; import com.thoughtworks.xstream.converters.UnmarshallingContext; -import com.thoughtworks.xstream.converters.reflection.MissingFieldException; import com.thoughtworks.xstream.converters.reflection.ObjectAccessException; import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider; import com.thoughtworks.xstream.converters.reflection.ReflectionConverter; @@ -38,7 +38,6 @@ import com.thoughtworks.xstream.core.util.Primitives; import com.thoughtworks.xstream.io.ExtendedHierarchicalStreamWriterHelper; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; -import com.thoughtworks.xstream.mapper.CannotResolveClassException; import com.thoughtworks.xstream.mapper.Mapper; import hudson.diagnosis.OldDataMonitor; import hudson.model.Saveable; @@ -293,14 +292,9 @@ public class RobustReflectionConverter implements Converter { implicitCollectionsForCurrentObject = writeValueToImplicitCollection(context, value, implicitCollectionsForCurrentObject, result, fieldName); } } - } catch (MissingFieldException e) { - LOGGER.log(FINE, "Skipping a non-existent field " + e.getFieldName(), e); - addErrorInContext(context, e); - } catch (CannotResolveClassException e) { - LOGGER.log(FINE, "Skipping a non-existent type", e); + } catch (XStreamException e) { addErrorInContext(context, e); } catch (LinkageError e) { - LOGGER.log(FINE, "Failed to resolve a type", e); addErrorInContext(context, e); } @@ -316,6 +310,7 @@ public class RobustReflectionConverter implements Converter { } public static void addErrorInContext(UnmarshallingContext context, Throwable e) { + LOGGER.log(FINE, "Failed to load", e); ArrayList list = (ArrayList)context.get("ReadError"); if (list == null) context.put("ReadError", list = new ArrayList()); diff --git a/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java b/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java index 6c901e008a..18fd97ec98 100644 --- a/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java +++ b/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java @@ -26,12 +26,12 @@ package hudson.util.xstream; import com.google.common.collect.ImmutableList; import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.XStreamException; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.converters.collections.CollectionConverter; import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; import com.thoughtworks.xstream.converters.reflection.SerializableConverter; import com.thoughtworks.xstream.io.HierarchicalStreamReader; -import com.thoughtworks.xstream.mapper.CannotResolveClassException; import com.thoughtworks.xstream.mapper.Mapper; import hudson.util.RobustReflectionConverter; @@ -76,7 +76,7 @@ public class ImmutableListConverter extends CollectionConverter { try { Object item = readItem(reader, context, items); items.add(item); - } catch (CannotResolveClassException e) { + } catch (XStreamException e) { RobustReflectionConverter.addErrorInContext(context, e); } catch (LinkageError e) { RobustReflectionConverter.addErrorInContext(context, e); diff --git a/test/src/test/groovy/hudson/model/RunMapTest.groovy b/test/src/test/groovy/hudson/model/RunMapTest.groovy index 8a1ca14036..63529cf668 100644 --- a/test/src/test/groovy/hudson/model/RunMapTest.groovy +++ b/test/src/test/groovy/hudson/model/RunMapTest.groovy @@ -53,7 +53,11 @@ class RunMapTest extends HudsonTestCase { b.save() p._getRuns().purgeCache() - assert p.getBuildByNumber(b.number)==null + b = p.getBuildByNumber(b.number) + // Original test assumed that b == null, but after JENKINS-21024 this is no longer true, + // so this may not really be testing anything interesting: + assert b != null + assert b.getAction(BombAction.class) == null assert bombed } diff --git a/test/src/test/java/hudson/util/RobustReflectionConverterTest.java b/test/src/test/java/hudson/util/RobustReflectionConverterTest.java new file mode 100644 index 0000000000..009c40a4c4 --- /dev/null +++ b/test/src/test/java/hudson/util/RobustReflectionConverterTest.java @@ -0,0 +1,56 @@ +/* + * The MIT License + * + * Copyright 2013 Jesse Glick. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package hudson.util; + +import hudson.diagnosis.OldDataMonitor; +import hudson.model.FreeStyleProject; +import hudson.model.Saveable; +import java.util.Collections; +import java.util.Map; +import static org.junit.Assert.*; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Bug; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.recipes.LocalData; + +public class RobustReflectionConverterTest { + + @Rule public JenkinsRule r = new JenkinsRule(); + + @Bug(21024) + @LocalData + @Test public void randomExceptionsReported() throws Exception { + FreeStyleProject p = r.jenkins.getItemByFullName("j", FreeStyleProject.class); + assertNotNull(p); + assertEquals(Collections.emptyMap(), p.getTriggers()); + OldDataMonitor odm = (OldDataMonitor) r.jenkins.getAdministrativeMonitor("OldData"); + Map data = odm.getData(); + assertEquals(Collections.singleton(p), data.keySet()); + String text = data.values().iterator().next().extra; + assertTrue(text, text.contains("Could not call hudson.triggers.TimerTrigger.readResolve")); + } + +} diff --git a/test/src/test/resources/hudson/util/RobustReflectionConverterTest/randomExceptionsReported.zip b/test/src/test/resources/hudson/util/RobustReflectionConverterTest/randomExceptionsReported.zip new file mode 100644 index 0000000000000000000000000000000000000000..23248c408552fdae4882537c67ab79944286157e GIT binary patch literal 276 zcmWIWW@Zs#U|`^2$jX}F%qz40ZVZsO5r_pDWEisYlZy4T^po@R(lXQaDspo|LpT|j zHC)yQfpBRBHv=Qf3uXoeFtJ%v5%a<#Ql3Jh4Ir1neda2QZ zkh+ONE@Eqx7Mm=!u=nR*7NDt4s6% literal 0 HcmV?d00001 -- GitLab From 66805b7463230da6512306b84485700aea83f349 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 16 Dec 2013 16:25:05 -0500 Subject: [PATCH 0589/1630] Why did these tests have timeouts? Seems to have caused spurious timeout errors. https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/1748/testReport/junit/hudson.scheduler/CronTabEventualityTest/testFirstSundayOfMonthWillBeEventuallyTriggeredWithinOneMonthAndOneWeek_0_/ java.lang.Exception: test timed out after 1000 milliseconds at java.io.UnixFileSystem.getBooleanAttributes0(Native Method) at java.io.UnixFileSystem.getBooleanAttributes(UnixFileSystem.java:242) at java.io.File.exists(File.java:772) at sun.misc.URLClassPath$FileLoader.getResource(URLClassPath.java:1072) at sun.misc.URLClassPath.getResource(URLClassPath.java:199) at java.net.URLClassLoader$1.run(URLClassLoader.java:358) at java.net.URLClassLoader$1.run(URLClassLoader.java:355) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:354) at java.lang.ClassLoader.loadClass(ClassLoader.java:424) at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308) at java.lang.ClassLoader.loadClass(ClassLoader.java:357) at hudson.scheduler.CronTab.set(CronTab.java:87) at hudson.scheduler.CronTab.(CronTab.java:83) at hudson.scheduler.CronTab.(CronTab.java:66) at hudson.scheduler.CronTabEventualityTest.checkEventuality(CronTabEventualityTest.java:113) at hudson.scheduler.CronTabEventualityTest.testFirstSundayOfMonthWillBeEventuallyTriggeredWithinOneMonthAndOneWeek(CronTabEventualityTest.java:109) --- .../scheduler/CronTabEventualityTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/src/test/java/hudson/scheduler/CronTabEventualityTest.java b/core/src/test/java/hudson/scheduler/CronTabEventualityTest.java index d322d402e8..45fae2367e 100644 --- a/core/src/test/java/hudson/scheduler/CronTabEventualityTest.java +++ b/core/src/test/java/hudson/scheduler/CronTabEventualityTest.java @@ -41,7 +41,7 @@ public class CronTabEventualityTest { this.hash = hash; } - @Test(timeout = 1000) + @Test @Bug(12388) public void testYearlyWillBeEventuallyTriggeredWithinOneYear() throws ANTLRException { Calendar start = new GregorianCalendar(2012, 0, 11, 22, 33); // Jan 11th 2012 22:33 @@ -49,7 +49,7 @@ public class CronTabEventualityTest { checkEventuality(start, "@yearly", limit); } - @Test(timeout = 1000) + @Test @Bug(12388) public void testAnnuallyWillBeEventuallyTriggeredWithinOneYear() throws ANTLRException { Calendar start = new GregorianCalendar(2012, 0, 11, 22, 33); // Jan 11th 2012 22:33 @@ -57,49 +57,49 @@ public class CronTabEventualityTest { checkEventuality(start, "@annually", limit); } - @Test(timeout = 1000) + @Test public void testMonthlyWillBeEventuallyTriggeredWithinOneMonth() throws ANTLRException { Calendar start = new GregorianCalendar(2012, 0, 11, 22, 33); // Jan 11th 2012 22:33 Calendar limit = createLimit(start, Calendar.MONTH, 1); checkEventuality(start, "@monthly", limit); } - @Test(timeout = 1000) + @Test public void testWeeklyWillBeEventuallyTriggeredWithinOneWeek() throws ANTLRException { Calendar start = new GregorianCalendar(2012, 0, 11, 22, 33); // Jan 11th 2012 22:33 Calendar limit = createLimit(start, Calendar.WEEK_OF_YEAR, 1); checkEventuality(start, "@weekly", limit); } - @Test(timeout = 1000) + @Test public void testDailyWillBeEventuallyTriggeredWithinOneDay() throws ANTLRException { Calendar start = new GregorianCalendar(2012, 0, 11, 22, 33); // Jan 11th 2012 22:33 Calendar limit = createLimit(start, Calendar.DAY_OF_MONTH, 1); checkEventuality(start, "@daily", limit); } - @Test(timeout = 1000) + @Test public void testMidnightWillBeEventuallyTriggeredWithinOneDay() throws ANTLRException { Calendar start = new GregorianCalendar(2012, 0, 11, 22, 33); // Jan 11th 2012 22:33 Calendar limit = createLimit(start, Calendar.DAY_OF_MONTH, 1); checkEventuality(start, "@midnight", limit); } - @Test(timeout = 1000) + @Test public void testHourlyWillBeEventuallyTriggeredWithinOneHour() throws ANTLRException { Calendar start = new GregorianCalendar(2012, 0, 11, 22, 33); // Jan 11th 2012 22:33 Calendar limit = createLimit(start, Calendar.HOUR, 1); checkEventuality(start, "@hourly", limit); } - @Test(timeout = 1000) + @Test public void testFirstDayOfMonthWillBeEventuallyTriggeredWithinOneMonth() throws ANTLRException { Calendar start = new GregorianCalendar(2012, 0, 11, 22, 33); // Jan 11th 2012 22:33 Calendar limit = createLimit(start, Calendar.MONTH, 1); checkEventuality(start, "H H 1 * *", limit); } - @Test(timeout = 1000) + @Test public void testFirstSundayOfMonthWillBeEventuallyTriggeredWithinOneMonthAndOneWeek() throws ANTLRException { Calendar start = new GregorianCalendar(2012, 0, 11, 22, 33); // Jan 11th 2012 22:33 Calendar limit = createLimit(start, Calendar.DAY_OF_MONTH, 31+7); -- GitLab From 7eecfeb261ad76a87eb4f7c24c7872e0afb90540 Mon Sep 17 00:00:00 2001 From: Kenichi Maehashi Date: Wed, 18 Dec 2013 01:10:05 +0900 Subject: [PATCH 0590/1630] set file.encoding=UTF-8 as default in OS X runner --- osx/Library/Application Support/Jenkins/jenkins-runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osx/Library/Application Support/Jenkins/jenkins-runner.sh b/osx/Library/Application Support/Jenkins/jenkins-runner.sh index b493d1c19c..0a8257252a 100755 --- a/osx/Library/Application Support/Jenkins/jenkins-runner.sh +++ b/osx/Library/Application Support/Jenkins/jenkins-runner.sh @@ -14,7 +14,7 @@ defaults="defaults read /Library/Preferences/org.jenkins-ci" war=`$defaults war` || war="/Applications/Jenkins/jenkins.war" -javaArgs="" +javaArgs="-Dfile.encoding=UTF-8" minPermGen=`$defaults minPermGen` && javaArgs="$javaArgs -XX:PermSize=${minPermGen}" permGen=`$defaults permGen` && javaArgs="$javaArgs -XX:MaxPermSize=${permGen}" -- GitLab From ef0b08499514d04c49ea41029d076aefb4d88dc7 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 17 Dec 2013 11:49:51 -0500 Subject: [PATCH 0591/1630] Moving some help files to mailer-plugin where they belong. --- .../webapp/help/project-config/mailer.html | 16 --------------- .../webapp/help/project-config/mailer_de.html | 17 ---------------- .../webapp/help/project-config/mailer_fr.html | 20 ------------------- .../webapp/help/project-config/mailer_ja.html | 16 --------------- .../help/project-config/mailer_pt_BR.html | 16 --------------- .../webapp/help/project-config/mailer_ru.html | 14 ------------- .../webapp/help/project-config/mailer_tr.html | 15 -------------- .../help/project-config/mailer_zh_TW.html | 12 ----------- .../help/tasks/mailer/sendToindividuals.html | 8 -------- .../tasks/mailer/sendToindividuals_de.html | 13 ------------ .../tasks/mailer/sendToindividuals_fr.html | 11 ---------- .../tasks/mailer/sendToindividuals_ja.html | 6 ------ .../tasks/mailer/sendToindividuals_nl.html | 10 ---------- .../tasks/mailer/sendToindividuals_pt_BR.html | 8 -------- .../tasks/mailer/sendToindividuals_ru.html | 9 --------- .../tasks/mailer/sendToindividuals_tr.html | 10 ---------- .../tasks/mailer/sendToindividuals_zh_CN.html | 8 -------- .../tasks/mailer/sendToindividuals_zh_TW.html | 7 ------- .../webapp/help/tasks/mailer/smtpAuth.html | 4 ---- .../webapp/help/tasks/mailer/smtpAuth_de.html | 4 ---- .../webapp/help/tasks/mailer/smtpAuth_fr.html | 5 ----- .../webapp/help/tasks/mailer/smtpAuth_ja.html | 4 ---- .../webapp/help/tasks/mailer/smtpAuth_nl.html | 4 ---- .../help/tasks/mailer/smtpAuth_pt_BR.html | 4 ---- .../webapp/help/tasks/mailer/smtpAuth_ru.html | 4 ---- .../webapp/help/tasks/mailer/smtpAuth_tr.html | 4 ---- .../help/tasks/mailer/smtpAuth_zh_CN.html | 3 --- .../help/tasks/mailer/smtpAuth_zh_TW.html | 3 --- 28 files changed, 255 deletions(-) delete mode 100644 war/src/main/webapp/help/project-config/mailer.html delete mode 100644 war/src/main/webapp/help/project-config/mailer_de.html delete mode 100644 war/src/main/webapp/help/project-config/mailer_fr.html delete mode 100644 war/src/main/webapp/help/project-config/mailer_ja.html delete mode 100644 war/src/main/webapp/help/project-config/mailer_pt_BR.html delete mode 100644 war/src/main/webapp/help/project-config/mailer_ru.html delete mode 100644 war/src/main/webapp/help/project-config/mailer_tr.html delete mode 100644 war/src/main/webapp/help/project-config/mailer_zh_TW.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/sendToindividuals.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/sendToindividuals_de.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/sendToindividuals_fr.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/sendToindividuals_ja.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/sendToindividuals_nl.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/sendToindividuals_pt_BR.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/sendToindividuals_ru.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/sendToindividuals_tr.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/sendToindividuals_zh_CN.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/sendToindividuals_zh_TW.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/smtpAuth.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/smtpAuth_de.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/smtpAuth_fr.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/smtpAuth_ja.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/smtpAuth_nl.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/smtpAuth_pt_BR.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/smtpAuth_ru.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/smtpAuth_tr.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/smtpAuth_zh_CN.html delete mode 100644 war/src/main/webapp/help/tasks/mailer/smtpAuth_zh_TW.html diff --git a/war/src/main/webapp/help/project-config/mailer.html b/war/src/main/webapp/help/project-config/mailer.html deleted file mode 100644 index ab7067e257..0000000000 --- a/war/src/main/webapp/help/project-config/mailer.html +++ /dev/null @@ -1,16 +0,0 @@ -

      - If configured, Jenkins will send out an e-mail to the specified recipients - when a certain important event occurs. - -
        -
      1. Every failed build triggers a new e-mail. -
      2. A successful build after a failed (or unstable) build triggers a new e-mail, - indicating that a crisis is over. -
      3. An unstable build after a successful build triggers a new e-mail, - indicating that there's a regression. -
      4. Unless configured, every unstable build triggers a new e-mail, - indicating that regression is still there. -
      - - For lazy projects where unstable builds are the norm, Uncheck "Send e-mail for every unstable build". -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/project-config/mailer_de.html b/war/src/main/webapp/help/project-config/mailer_de.html deleted file mode 100644 index fc83f7daa4..0000000000 --- a/war/src/main/webapp/help/project-config/mailer_de.html +++ /dev/null @@ -1,17 +0,0 @@ -
      - Ist diese Option konfiguriert, sendet Jenkins E-Mails an die angegebenen Empfänger - wenn bestimmte wichtige Ereignisse eintreten. - -
        -
      1. Jeder fehlgeschlagene Build löst eine neue E-Mail aus. -
      2. Ein erfolgreicher Build nach einem fehlgeschlagenen (oder instabilen) - löst eine neue E-Mail aus, um über eine überstandene Krise zu informieren. -
      3. Ein instabiler Build nach einem erfolgreichen löst eine neue E-Mail aus, - um über einen Regressionsfehler zu informieren. -
      4. Sofern nicht anders konfiguriert, lost jeder instabile Build eine neue - E-Mail aus, um über weiter anhaltende Regressionsfehler zu informieren. -
      - - Für nachlässige Projekte, in denen instabile Projekte der Regelfall sind, wählen Sie - "E-Mail für jeden instabilen Build senden" ab. -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/project-config/mailer_fr.html b/war/src/main/webapp/help/project-config/mailer_fr.html deleted file mode 100644 index fee081e6b1..0000000000 --- a/war/src/main/webapp/help/project-config/mailer_fr.html +++ /dev/null @@ -1,20 +0,0 @@ -
      - Jenkins a la capacité d'envoyer des emails aux destinaires spécifiés - lorsque certains évènements importants ont eu lieu. - -
        -
      1. Chaque build en échec provoque l'envoi d'un mail. -
      2. Un build qui passe avec succès après un build en échec - provoque l'envoi d'un mail, ce qui permet de savoir qu'une situation - de crise est résolue. -
      3. Un build instable après un build avec succès provoque l'envoi - d'un mail, indiquant ainsi qu'il y a eu une régression. -
      4. Sauf configuration contraire, chaque build instable - provoque l'envoi d'un mail, indiquant ainsi qu'une régression est - toujours d'actualité. -
      - - Pour les projets qui ne suivent pas les bonnes pratiques et - où les builds instables sont la norme, décochez la case - "Envoyer un email à chaque build instable". -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/project-config/mailer_ja.html b/war/src/main/webapp/help/project-config/mailer_ja.html deleted file mode 100644 index 324576e60e..0000000000 --- a/war/src/main/webapp/help/project-config/mailer_ja.html +++ /dev/null @@ -1,16 +0,0 @@ -
      - 設定すると、Jenkinsは特定の重要なイベントが発生した際に、指定した宛先にメールを送信します。 - -
        -
      1. ビルドが失敗するごとに、メールを送信します。 -
      2. ビルドが失敗(もしくは不安定)した直後にビルドが成功すると、 - 危機を脱したことを告げるメールを送信します。 -
      3. ビルドが成功した直後にビルドが不安定になると、 - デグレートがあることを告げるメールを送信します。 -
      4. 設定しなければ、ビルドが不安定になるごとに、 - デグレートがまだ存在することを告げるメールを送信します。 -
      - - 不安定ビルドであることが常である、だらだらしたプロジェクトでは、 - "不安定ビルドも逐一メールを送る"をチェックしないようにします。 -
      diff --git a/war/src/main/webapp/help/project-config/mailer_pt_BR.html b/war/src/main/webapp/help/project-config/mailer_pt_BR.html deleted file mode 100644 index 5e254689a6..0000000000 --- a/war/src/main/webapp/help/project-config/mailer_pt_BR.html +++ /dev/null @@ -1,16 +0,0 @@ -
      - Se configurado, o Jenkins enviará um e-mail para os destinatários especificados - quanod um certo evento importante ocorrer. - -
        -
      1. Toda construção que falha dispara um novo e-mail. -
      2. Uma construção feita com sucesso após uma construção falha (ou instável) dipara um novo e-mail, - indicando que uma crise terminou. -
      3. Uma construção instável após uma construção bem sucedida dispara um novo e-mail, - indicando que há uma regressão. -
      4. A menos que configurado, toda construção instável dipara um novo e-mail, - indicando que a regressão ainda está lá. -
      - - Par projetos preguiçosos (lazy) onde construções instávei são a norma, Marque "Não enviar e-mail para toda construção instável". -
      diff --git a/war/src/main/webapp/help/project-config/mailer_ru.html b/war/src/main/webapp/help/project-config/mailer_ru.html deleted file mode 100644 index 8b11786d9d..0000000000 --- a/war/src/main/webapp/help/project-config/mailer_ru.html +++ /dev/null @@ -1,14 +0,0 @@ -
      - Если указан список получателей, Jenkins будет отправлять уведомления по электронной - почте на эти адреса при наступлении следующих событий: - -
        -
      1. Каждая провалившаяся сборка -
      2. Успешная сборка после провалившихся (или нестабильных) -
      3. Нестабильная сборка после стабильной (сообщает о появлении регрессии) -
      4. Каждая нестабильная сборка (если не запрещено другими настройками) -
      - - Для "ленивых" проектов, где нестабильная сборка считается нормой, установите - флажок "Не отправлять уведомление для каждой нестабильной сборки". -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/project-config/mailer_tr.html b/war/src/main/webapp/help/project-config/mailer_tr.html deleted file mode 100644 index d150881482..0000000000 --- a/war/src/main/webapp/help/project-config/mailer_tr.html +++ /dev/null @@ -1,15 +0,0 @@ -
      - Bu ayar, Husdon'ın önemli bir durum oluştuğunda belirtilen alıcılara mail atmasını sağlar. - -
        -
      1. Her başarısız yapılandırma e-posta atılmasını tetikler. -
      2. Başarısız (veya dengesiz) bir yapılandırmadan sonraki ilk başarılı yapılandırma yeni - bir e-posta atılmasını tetikler, ki bu da kriz durumunun sona erdiğini ifade eder. -
      3. Başarılı bir yapılandırmadan hemen sonraki dengesiz yapılandırma e-posta atılmasını tetikler, - ki bu da bir gerileme olduğunu ifade eder. -
      4. Konfigürasyon yapılmazsa, her dengesiz yapılandırma e-posta atılmasını tetikler, - ki bu da gerilemenin hala mevcut olduğunu ifade eder. -
      - - Dengesiz yapılandırmaların standartlaştığı projelerde, "Her dengesiz yapılandırmada e-posta gönderme" seçeneğini seçiniz. -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/project-config/mailer_zh_TW.html b/war/src/main/webapp/help/project-config/mailer_zh_TW.html deleted file mode 100644 index a4108e44f9..0000000000 --- a/war/src/main/webapp/help/project-config/mailer_zh_TW.html +++ /dev/null @@ -1,12 +0,0 @@ -
      - 設定後，Jenkins 會在特定重大事情發生時，寄送電子郵件給指定的收件人。 - -
        -
      1. 每次建置失敗都會觸發寄送新郵件。 -
      2. 建置失敗 (或不穩定) 後建置成功將會觸發寄送郵件，告訴大家危機已經解除。 -
      3. 建置成功後如果發生建置不穩定也會觸發寄送郵件，昭告天下我們又倒退了一步。 -
      4. 除非另外設定，不然每次不穩定的建置都會觸發寄送郵件，告訴大家狀況還沒解除。 -
      - - 對散漫的專案來說，不穩定的建置是常態，就把「每次建置不穩定都寄送郵件」選項給勾掉吧...。 -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/sendToindividuals.html b/war/src/main/webapp/help/tasks/mailer/sendToindividuals.html deleted file mode 100644 index 97d06edb4b..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/sendToindividuals.html +++ /dev/null @@ -1,8 +0,0 @@ -
      - If this option is checked, the notification e-mail will be sent to individuals who have - committed changes for the broken build (by assuming that those changes broke the build). -

      - If e-mail addresses are also specified in the recipient list, then both the individuals - as well as the specified addresses get the notification e-mail. If the recipient list - is empty, then only the individuals will receive e-mails. -

      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_de.html b/war/src/main/webapp/help/tasks/mailer/sendToindividuals_de.html deleted file mode 100644 index c4e8aa63d5..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_de.html +++ /dev/null @@ -1,13 +0,0 @@ -
      - Schickt E-Mail-Benachrichtigungen an alle "verursachenden" Benutzer, die mit - eingecheckten Änderungen an einem fehlgeschlagenen Build beteiligt waren - (in der Vermutung, daß diese Änderungen den Fehlschlag verursachten). - -

      - - Wenn im Empfänger-Verteiler ebenfalls Adressen angegeben sind, werden - E-Mail-Benachrichtigungen sowohl an alle Adressen des Empfänger-Verteilers - als auch an die "verursachenden" Benutzer geschickt. Ist der E-Mail-Verteiler - hingegen leer, erhalten ausschließlich die "verursachenden" Benutzer - E-Mail-Benachrichtigungen. -

      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_fr.html b/war/src/main/webapp/help/tasks/mailer/sendToindividuals_fr.html deleted file mode 100644 index 7e58425c12..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_fr.html +++ /dev/null @@ -1,11 +0,0 @@ -
      - Si cette option est choisie, les notifications par email seront envoyées - aux personnes qui ont fait des modifications dans un build en échec - (on suppose que ces changements ont cassé ce build). -

      - Si des adresses email sont aussi spécifiées sur la liste des destinataires, - alors l'email de notification est envoyé à la fois à cette liste et aux - personnes ayant fait des modifications. - Si la liste des destinataires est vide, alors seules les personnes - changeurs recevront des emails. -

      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_ja.html b/war/src/main/webapp/help/tasks/mailer/sendToindividuals_ja.html deleted file mode 100644 index 9ba072edae..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_ja.html +++ /dev/null @@ -1,6 +0,0 @@ -
      - 壊れたビルドに含まれる変更をコミットした個人にメールを送信します(変更がビルドを壊したとみなします)。 -

      - 宛先にもメールアドレスが指定されている場合、ここに指定された個人と指定されたアドレスにもにメールを送信します。 - 宛先が指定されていない場合、ここに指定した個人にだけメールを送信します。 -

      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_nl.html b/war/src/main/webapp/help/tasks/mailer/sendToindividuals_nl.html deleted file mode 100644 index c9d5658dd8..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_nl.html +++ /dev/null @@ -1,10 +0,0 @@ -
      - Indien aangevinkt, zal er een e-mail verstuurd worden naar de personen die wijzigingen - opgeladen hebben, in de context van een gefaalde bouwpoging. Hierbij wordt ervan uitgegaan - dat één van die wijziging de bouwpoging heeft doen falen. -

      - Indien u de lijst van geaddresseerden opgeeft, worden zowel de personen die wijzigingen - hebben doorgevoerd als de geaddresseerden, via e-mail op de hoogte gebracht. Indien U geen - geaddresseerden opgeeft worden enkel de personen die wijzigingen hebben doorgevoerd via e-mail - op de hoogte gebracht. -

      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_pt_BR.html b/war/src/main/webapp/help/tasks/mailer/sendToindividuals_pt_BR.html deleted file mode 100644 index dedbc9219e..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_pt_BR.html +++ /dev/null @@ -1,8 +0,0 @@ -
      - Se esta opção estiver marcada, o e-mail de notificação será enviado para os indivíduos que - comitaram mudanças para a costrução que falhou (assumindo que estas mudanças causaram a falha na construção). -

      - Se os endereços de e-mail também forem especificados na lista de destinatários, então ambos os indivíduos - bem como os endereços especificados na lista receberão e-mails. Se a lista de destinatários - estiver vazia, então apens os indivíduos receberão e-mails. -

      diff --git a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_ru.html b/war/src/main/webapp/help/tasks/mailer/sendToindividuals_ru.html deleted file mode 100644 index 503f14d282..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_ru.html +++ /dev/null @@ -1,9 +0,0 @@ -
      - Если эта настройка включена, уведомление будет отправлено тем лицам, - которые вносили изменения в провалившуюся сборку (предполагая, что сборку сломали - именно эти изменения). -

      - Если адреса также указаны в списке получателей, тогда два списка будут объединены. - Если список получателей пуст, уведомления получат только авторы последний изменений - (произошедших от момента предыдущей сборки до текущей). -

      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_tr.html b/war/src/main/webapp/help/tasks/mailer/sendToindividuals_tr.html deleted file mode 100644 index 3de016e58f..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_tr.html +++ /dev/null @@ -1,10 +0,0 @@ -
      - Bu seçenek, bozuk bir yapılandırmaya değişiklikleri ile katılan bireylere, yapılandırmanın bozuk - olduğu ile ilgili e-posta atılmasını sağlar (yapılandırmayı bozanın, değişiklikleri yapan - bireyler olduğu varsayılarak) - -

      - Eğer alıcı listesinde e-posta adresi belirtilmişse, hem bu alıcılar, hem de değişiklikleri gönderen - bireyler bu e-postayı alacaklardır. Eğer alıcı listesi boşsa, sadece değişiklikleri gönderen - bireylere e-posta gönderilir. -

      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_zh_CN.html b/war/src/main/webapp/help/tasks/mailer/sendToindividuals_zh_CN.html deleted file mode 100644 index 67398b4470..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_zh_CN.html +++ /dev/null @@ -1,8 +0,0 @@ -
      - If this option is checked, the notification e-mail will be sent to individuals who have - committed changes for the broken build (by assuming that those changes broke the build). -

      - If e-mail addresses are also specified in the recipient list, then both the individuals - as well as the specified addresses get the notification e-mail. If the recipient list - is empty, then only the individuals will receive e-mails. -

      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_zh_TW.html b/war/src/main/webapp/help/tasks/mailer/sendToindividuals_zh_TW.html deleted file mode 100644 index 5cc2ce0edc..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/sendToindividuals_zh_TW.html +++ /dev/null @@ -1,7 +0,0 @@ -
      - 選項啟用後，通知信會寄給有 Commit 變更，導致這次建置失敗的每一個人 - (假設是這些變更造成建置失敗)。 -

      - 如果有指定收件人清單，那些有嫌疑的人及指定的人都會收到通知郵件。 - 要是收件人清單是空的，就只有那些人會收到信。 -

      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/smtpAuth.html b/war/src/main/webapp/help/tasks/mailer/smtpAuth.html deleted file mode 100644 index f16780ea8a..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/smtpAuth.html +++ /dev/null @@ -1,4 +0,0 @@ -
      - Use SMTP authentication when sending out e-mails. If your environment requires - the use of SMTP authentication, specify its user name and the password here. -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/smtpAuth_de.html b/war/src/main/webapp/help/tasks/mailer/smtpAuth_de.html deleted file mode 100644 index 1ce2e0ad1e..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/smtpAuth_de.html +++ /dev/null @@ -1,4 +0,0 @@ -
      - Verwendet SMTP Authentifizierung beim Verschicken von E-Mails. Wenn Ihr E-Mail-Server - SMTP Authentifizierung verlangt, geben Sie hier Ihren Benutzernamen und Passwort an. -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/smtpAuth_fr.html b/war/src/main/webapp/help/tasks/mailer/smtpAuth_fr.html deleted file mode 100644 index c28370169c..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/smtpAuth_fr.html +++ /dev/null @@ -1,5 +0,0 @@ -
      - Cette option provoque l'authentification SMTP lors de l'envoi d'emails. - Si votre environnement nécessite l'utilisation de l'authentification SMTP, - spécifiez ici son nom d'utilisateur et mot de passe. -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/smtpAuth_ja.html b/war/src/main/webapp/help/tasks/mailer/smtpAuth_ja.html deleted file mode 100644 index 6f225b14e8..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/smtpAuth_ja.html +++ /dev/null @@ -1,4 +0,0 @@ -
      - メール送信時にSMTP認証を使用します。SMTP認証が必要な環境であれば、 - ユーザー名とパスワードを指定してください。 -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/smtpAuth_nl.html b/war/src/main/webapp/help/tasks/mailer/smtpAuth_nl.html deleted file mode 100644 index 5a1d2a661d..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/smtpAuth_nl.html +++ /dev/null @@ -1,4 +0,0 @@ -
      - Gebruikt SMTP authenticatie bij het uitsturen van e-mails. Gelieve, indien uw omgeving - SMTP authenticatie vereist, hier uw gebruikersnaam en paswoord op te geven. -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/smtpAuth_pt_BR.html b/war/src/main/webapp/help/tasks/mailer/smtpAuth_pt_BR.html deleted file mode 100644 index 859ea68f24..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/smtpAuth_pt_BR.html +++ /dev/null @@ -1,4 +0,0 @@ -
      - Usa autenticação SMTP quando enviar e-mails. Se seu ambiente requer - o uso de autenticação SMTP, especifique o usuário e senha aqui. -
      diff --git a/war/src/main/webapp/help/tasks/mailer/smtpAuth_ru.html b/war/src/main/webapp/help/tasks/mailer/smtpAuth_ru.html deleted file mode 100644 index 4074932364..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/smtpAuth_ru.html +++ /dev/null @@ -1,4 +0,0 @@ -
      - Использовать аутентификацию SMTP при отправке почты. Если ваш сервер требует - аутентификации, укажите логин и пароль здесь. -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/smtpAuth_tr.html b/war/src/main/webapp/help/tasks/mailer/smtpAuth_tr.html deleted file mode 100644 index 2bef640796..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/smtpAuth_tr.html +++ /dev/null @@ -1,4 +0,0 @@ -
      - E-posta gönderilmesi esnasında SMTP doğrulaması kullanılır. Eğer ortamınız SMTP - doğrulaması kullanıyorsa, kullanıcı adı ve şifreyi burada belirtiniz. -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/smtpAuth_zh_CN.html b/war/src/main/webapp/help/tasks/mailer/smtpAuth_zh_CN.html deleted file mode 100644 index 6fd8cc8a2c..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/smtpAuth_zh_CN.html +++ /dev/null @@ -1,3 +0,0 @@ -
      - 当发送邮件时使用SMTP认证.如果你的环境需要使用SMTP认证,在这里指定其用户名和密码. -
      \ No newline at end of file diff --git a/war/src/main/webapp/help/tasks/mailer/smtpAuth_zh_TW.html b/war/src/main/webapp/help/tasks/mailer/smtpAuth_zh_TW.html deleted file mode 100644 index b7f19d1bfe..0000000000 --- a/war/src/main/webapp/help/tasks/mailer/smtpAuth_zh_TW.html +++ /dev/null @@ -1,3 +0,0 @@ -
      - 送出電子郵件時使用 SMTP 驗證。如果您的環境要求要 SMTP 驗證，請把使用者名稱及密碼設在這裡。 -
      \ No newline at end of file -- GitLab From 3befec39a3392f0bb6870c5361397b773027bb51 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 17 Dec 2013 12:13:44 -0500 Subject: [PATCH 0592/1630] optionalBlock.jelly should only set a default value for help when field is set. Otherwise Descriptor.getHelpFile(null) is called, which may produce a help page, but generally the wrong one. (entry.jelly was already correct, so just making it consistent.) --- core/src/main/resources/lib/form/optionalBlock.jelly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/form/optionalBlock.jelly b/core/src/main/resources/lib/form/optionalBlock.jelly index a8595d7fcb..b4f1bb26f3 100644 --- a/core/src/main/resources/lib/form/optionalBlock.jelly +++ b/core/src/main/resources/lib/form/optionalBlock.jelly @@ -58,7 +58,7 @@ THE SOFTWARE. if present, the foldable section will not be grouped into a separate JSON object upon submission - + -- GitLab From 4364a58c0db552b86434b06a7bc912dfe0fc8b6a Mon Sep 17 00:00:00 2001 From: Alex Earl Date: Tue, 17 Dec 2013 12:30:09 -0700 Subject: [PATCH 0593/1630] Add note to class javadoc --- core/src/main/java/hudson/triggers/SCMTrigger.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/main/java/hudson/triggers/SCMTrigger.java b/core/src/main/java/hudson/triggers/SCMTrigger.java index 0bcea37220..8f1ea3ac08 100644 --- a/core/src/main/java/hudson/triggers/SCMTrigger.java +++ b/core/src/main/java/hudson/triggers/SCMTrigger.java @@ -74,6 +74,12 @@ import jenkins.model.RunAction2; /** * {@link Trigger} that checks for SCM updates periodically. * + * You can add UI elements under the SCM section by creating a + * config.jelly or config.groovy in the resources area for + * your class that inherits from SCMTrigger and has the + * @{@link hudson.model.Extension} annotation. The UI should + * be wrapped in an f:section element to denote it. + * * @author Kohsuke Kawaguchi */ public class SCMTrigger extends Trigger { -- GitLab From 6c9ab145d33c1587979f54a327e27ce11c5210d0 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 17 Dec 2013 16:38:46 -0500 Subject: [PATCH 0594/1630] copyButton.js uses @include, so there is no need to explicitly include ZeroClipboard here too. --- core/src/main/resources/lib/layout/copyButton.jelly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/layout/copyButton.jelly b/core/src/main/resources/lib/layout/copyButton.jelly index cd6e74ba1c..3d85c22be7 100644 --- a/core/src/main/resources/lib/layout/copyButton.jelly +++ b/core/src/main/resources/lib/layout/copyButton.jelly @@ -50,5 +50,5 @@ THE SOFTWARE. - + \ No newline at end of file -- GitLab From d81c2406a27cee80542dbaecae31ce1b04e0ab52 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 17 Dec 2013 18:55:29 -0500 Subject: [PATCH 0595/1630] Updated maven-plugin & mailer dependencies so that HelpLinkTest will pass. --- pom.xml | 2 +- test/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6a117cd923..5e91e16fa2 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ THE SOFTWARE. jenkins-jira 1.7.4 - 2.0 + 2.1 none ${skipTests} diff --git a/test/pom.xml b/test/pom.xml index a10c7787af..f5e7cd91fd 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -79,7 +79,7 @@ THE SOFTWARE. org.jenkins-ci.plugins mailer - 1.5 + 1.8 org.jenkins-ci.plugins -- GitLab From 358fe7fe3a64fcb113caef608759c724f008a37e Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 18 Dec 2013 11:25:28 -0500 Subject: [PATCH 0596/1630] Extra trailing newline. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8737be1df0..f8949fcd67 100644 --- a/README.md +++ b/README.md @@ -26,4 +26,3 @@ All about Jenkins CI can be found on our [website]. Follow us on Twitter @[jenki [GitHub]: https://github.com/jenkinsci/jenkins [website]: http://jenkins-ci.org [jenkinsci]: http://twitter.com/jenkinsci - -- GitLab From a6e01f77c6d3d72f7ac9e99ce061ce04dbf4b515 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 18 Dec 2013 13:39:18 -0500 Subject: [PATCH 0597/1630] [FIXED JENKINS-21078] Optimizing loadIdOnDisk. --- changelog.html | 3 ++ core/src/main/java/hudson/model/RunMap.java | 19 ++++----- .../model/lazy/AbstractLazyLoadRunMap.java | 42 +++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/changelog.html b/changelog.html index e20c5644f6..f3772de41c 100644 --- a/changelog.html +++ b/changelog.html @@ -61,6 +61,9 @@ Upcoming changes
    • Better robustness against XML deserialization errors. (issue 21024) +
    • + Minimizing disk I/O while loading the names of build records during Jenkins startup. + (issue 21078)
    • Avoiding serializing the owning build as part of a test result action, as this can lead to errors later. (issue 18410) diff --git a/core/src/main/java/hudson/model/RunMap.java b/core/src/main/java/hudson/model/RunMap.java index 7afdabbfbc..a7aa192124 100644 --- a/core/src/main/java/hudson/model/RunMap.java +++ b/core/src/main/java/hudson/model/RunMap.java @@ -194,24 +194,21 @@ public final class RunMap> extends AbstractLazyLoadRunMap final SimpleDateFormat formatter = Run.ID_FORMATTER.get(); return new FilenameFilter() { - public boolean accept(File dir, String name) { - // JENKINS-1461 sometimes create bogus data directories with impossible dates, such as year 0, April 31st, - // or August 0th. Date object doesn't roundtrip those, so we eventually fail to load this data. - // Don't even bother trying. - if (!isCorrectDate(name)) { - LOGGER.log(FINE, "Skipping {0}", new File(dir,name)); + @Override public boolean accept(File dir, String name) { + if (name.startsWith("0000")) { + // JENKINS-1461 sometimes create bogus data directories with impossible dates, such as year 0, April 31st, + // or August 0th. Date object doesn't roundtrip those, so we eventually fail to load this data. + // Don't even bother trying. return false; } - return !name.startsWith("0000") && new File(dir,name).isDirectory(); - } - - private boolean isCorrectDate(String name) { try { - if(formatter.format(formatter.parse(name)).equals(name)) + if (formatter.format(formatter.parse(name)).equals(name)) { return true; + } } catch (ParseException e) { // fall through } + LOGGER.log(FINE, "Skipping {0} in {1}", new Object[] {name, dir}); return false; } }; diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java index 92561a23a4..a0c50a67a3 100644 --- a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java +++ b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java @@ -26,19 +26,15 @@ package jenkins.model.lazy; import hudson.model.Job; import hudson.model.Run; import hudson.model.RunMap; -import org.apache.commons.collections.keyvalue.DefaultMapEntry; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.File; import java.io.FilenameFilter; import java.io.IOException; import java.lang.ref.Reference; import java.util.AbstractMap; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Comparator; +import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; @@ -50,6 +46,9 @@ import javax.annotation.CheckForNull; import static jenkins.model.lazy.AbstractLazyLoadRunMap.Direction.*; import static jenkins.model.lazy.Boundary.*; +import org.apache.commons.collections.keyvalue.DefaultMapEntry; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * {@link SortedMap} that keeps build records by their build numbers, in the descending order @@ -224,26 +223,27 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i } private void loadIdOnDisk() { - String[] buildDirs = dir.list(createDirectoryFilter()); - if (buildDirs==null) { + String[] kids = dir.list(); + if (kids == null) { // the job may have just been created - buildDirs=EMPTY_STRING_ARRAY; + kids = EMPTY_STRING_ARRAY; } - // wrap into ArrayList to enable mutation - Arrays.sort(buildDirs); - idOnDisk = new SortedList(new ArrayList(Arrays.asList(buildDirs))); - - // TODO: should we check that shortcuts is a symlink? - String[] shortcuts = dir.list(); - if (shortcuts==null) shortcuts=EMPTY_STRING_ARRAY; - SortedIntList list = new SortedIntList(shortcuts.length/2); - for (String s : shortcuts) { - try { - list.add(Integer.parseInt(s)); - } catch (NumberFormatException e) { - // this isn't a shortcut + List buildDirs = new ArrayList(); + FilenameFilter buildDirFilter = createDirectoryFilter(); + SortedIntList list = new SortedIntList(kids.length / 2); + for (String s : kids) { + if (buildDirFilter.accept(dir, s)) { + buildDirs.add(s); + } else { + try { + list.add(Integer.parseInt(s)); + } catch (NumberFormatException e) { + // this isn't a shortcut + } } } + Collections.sort(buildDirs); + idOnDisk = new SortedList(buildDirs); list.sort(); numberOnDisk = list; } -- GitLab From 1d21017e3b54edb36a58aa7d7658250b4f221c80 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 18 Dec 2013 17:26:25 -0500 Subject: [PATCH 0598/1630] [FIXED JENKINS-20008] Added DirectlyModifiableTopLevelItemGroup. --- .../DirectlyModifiableTopLevelItemGroup.java | 59 +++++++++++++++++++ core/src/main/java/jenkins/model/Jenkins.java | 16 ++++- .../org/jvnet/hudson/test/MockFolder.java | 16 ++++- 3 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 core/src/main/java/jenkins/model/DirectlyModifiableTopLevelItemGroup.java diff --git a/core/src/main/java/jenkins/model/DirectlyModifiableTopLevelItemGroup.java b/core/src/main/java/jenkins/model/DirectlyModifiableTopLevelItemGroup.java new file mode 100644 index 0000000000..d772b06a24 --- /dev/null +++ b/core/src/main/java/jenkins/model/DirectlyModifiableTopLevelItemGroup.java @@ -0,0 +1,59 @@ +/* + * The MIT License + * + * Copyright 2013 Jesse Glick. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package jenkins.model; + +import hudson.model.Item; +import hudson.model.TopLevelItem; +import hudson.model.listeners.ItemListener; +import java.io.IOException; + +/** + * Item group which supports items being directly moved in or out of it. + * @since TODO + */ +public interface DirectlyModifiableTopLevelItemGroup extends ModifiableTopLevelItemGroup { + + /** + * Returns true if a particular item may be added to this group. + * @param item an item currently elsewhere + * @return true if {@link #add} may be called with this item + */ + boolean canAdd(TopLevelItem item); + + /** + * Adds an item to this group. + * Unlike {@link Jenkins#putItem} this does not try to call {@link Item#delete} on an existing item, nor does it fire {@link ItemListener#onCreated}, nor check permissions. + * Normally you would call {@link Item#onLoad} after calling this method (the implementation is not expected to do so). + * To remove an item, use {@link #onDeleted}. + * @param the kind of item + * @param item an item to add which is currently elsewhere + * @param name the desired item name in this group (might simply be the original {@link Item#getName}) + * @return normally the same {@code item}, but might be a new cppy if necessary + * @throws IOException if adding fails + * @throws IllegalArgumentException if {@link #canAdd} is false, or an item with this name already exists, or this item is as yet unnamed + */ + I add(I item, String name) throws IOException, IllegalArgumentException; + +} diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index b2d657faf0..18249eb50f 100755 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -304,7 +304,7 @@ import javax.annotation.Nullable; * @author Kohsuke Kawaguchi */ @ExportedBean -public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGroup, StaplerProxy, StaplerFallback, +public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLevelItemGroup, StaplerProxy, StaplerFallback, ModifiableViewGroup, AccessControlled, DescriptorByNameOwner, ModelObjectWithContextMenu, ModelObjectWithChildren { private transient final Queue queue; @@ -472,7 +472,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro * Active {@link Cloud}s. */ public final Hudson.CloudList clouds = new Hudson.CloudList(this); - + public static class CloudList extends DescribableList> { public CloudList(Jenkins h) { super(h); @@ -2452,6 +2452,18 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro save(); } + @Override public boolean canAdd(TopLevelItem item) { + return true; + } + + @Override synchronized public I add(I item, String name) throws IOException, IllegalArgumentException { + if (items.containsKey(name)) { + throw new IllegalArgumentException("already an item '" + name + "'"); + } + items.put(name, item); + return item; + } + public FingerprintMap getFingerprintMap() { return fingerprintMap; } diff --git a/test/src/main/java/org/jvnet/hudson/test/MockFolder.java b/test/src/main/java/org/jvnet/hudson/test/MockFolder.java index 67437dd530..eef19bc821 100644 --- a/test/src/main/java/org/jvnet/hudson/test/MockFolder.java +++ b/test/src/main/java/org/jvnet/hudson/test/MockFolder.java @@ -54,8 +54,8 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import javax.servlet.ServletException; +import jenkins.model.DirectlyModifiableTopLevelItemGroup; import jenkins.model.Jenkins; -import jenkins.model.ModifiableTopLevelItemGroup; import org.kohsuke.stapler.StaplerFallback; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -69,7 +69,7 @@ import org.kohsuke.stapler.WebMethod; * @since 1.494 */ @SuppressWarnings({"unchecked", "rawtypes"}) // the usual API mistakes -public class MockFolder extends AbstractItem implements ModifiableTopLevelItemGroup, TopLevelItem, ModifiableViewGroup, StaplerFallback { +public class MockFolder extends AbstractItem implements DirectlyModifiableTopLevelItemGroup, TopLevelItem, ModifiableViewGroup, StaplerFallback { private transient Map items = new TreeMap(); private final List views = new ArrayList(Collections.singleton(new AllView("All", this))); @@ -187,6 +187,18 @@ public class MockFolder extends AbstractItem implements ModifiableTopLevelItemGr items.remove(item.getName()); } + @Override public boolean canAdd(TopLevelItem item) { + return true; + } + + @Override synchronized public I add(I item, String name) throws IOException, IllegalArgumentException { + if (items.containsKey(name)) { + throw new IllegalArgumentException("already an item '" + name + "'"); + } + items.put(name, item); + return item; + } + @Override public TopLevelItemDescriptor getDescriptor() { return Jenkins.getInstance().getDescriptorByType(DescriptorImpl.class); } -- GitLab From 3f5b7e7624dcf3229a337c1a8536e2a7881ab437 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 18 Dec 2013 17:43:04 -0500 Subject: [PATCH 0599/1630] ItemListener.fireOnDeleted --- core/src/main/java/hudson/model/ItemGroup.java | 2 ++ .../main/java/hudson/model/listeners/ItemListener.java | 8 ++++++++ core/src/main/java/jenkins/model/Jenkins.java | 3 +-- test/src/main/java/org/jvnet/hudson/test/MockFolder.java | 9 ++++++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/model/ItemGroup.java b/core/src/main/java/hudson/model/ItemGroup.java index a87814eb9d..1a7b5885c8 100644 --- a/core/src/main/java/hudson/model/ItemGroup.java +++ b/core/src/main/java/hudson/model/ItemGroup.java @@ -23,6 +23,7 @@ */ package hudson.model; +import hudson.model.listeners.ItemListener; import java.io.IOException; import java.util.Collection; import java.io.File; @@ -81,6 +82,7 @@ public interface ItemGroup extends PersistenceRoot, ModelObject /** * Internal method. Called by {@link Item}s when they are deleted by users. + * Should normally call {@link ItemListener#fireOnDeleted} and {@link View#onJobRenamed} (with a null {@code newName}). */ void onDeleted(T item) throws IOException; } diff --git a/core/src/main/java/hudson/model/listeners/ItemListener.java b/core/src/main/java/hudson/model/listeners/ItemListener.java index bf729216db..1c8cb1c5db 100644 --- a/core/src/main/java/hudson/model/listeners/ItemListener.java +++ b/core/src/main/java/hudson/model/listeners/ItemListener.java @@ -141,4 +141,12 @@ public class ItemListener implements ExtensionPoint { for (ItemListener l : all()) l.onUpdated(item); } + + /** @since TODO */ + public static void fireOnDeleted(Item item) { + for (ItemListener l : all()) { + l.onDeleted(item); + } + } + } diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 18249eb50f..895bb7d384 100755 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -2443,8 +2443,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve * Called in response to {@link Job#doDoDelete(StaplerRequest, StaplerResponse)} */ public void onDeleted(TopLevelItem item) throws IOException { - for (ItemListener l : ItemListener.all()) - l.onDeleted(item); + ItemListener.fireOnDeleted(item); items.remove(item.getName()); for (View v : views) diff --git a/test/src/main/java/org/jvnet/hudson/test/MockFolder.java b/test/src/main/java/org/jvnet/hudson/test/MockFolder.java index eef19bc821..faab863587 100644 --- a/test/src/main/java/org/jvnet/hudson/test/MockFolder.java +++ b/test/src/main/java/org/jvnet/hudson/test/MockFolder.java @@ -39,6 +39,7 @@ import hudson.model.TopLevelItem; import hudson.model.TopLevelItemDescriptor; import hudson.model.View; import hudson.model.ViewGroupMixIn; +import hudson.model.listeners.ItemListener; import hudson.util.Function1; import hudson.views.DefaultViewsTabBar; import hudson.views.ViewsTabBar; @@ -180,11 +181,17 @@ public class MockFolder extends AbstractItem implements DirectlyModifiableTopLev @Override public void onRenamed(TopLevelItem item, String oldName, String newName) throws IOException { items.remove(oldName); items.put(newName, item); + for (View v : views) { + v.onJobRenamed(item, oldName, newName); + } } @Override public void onDeleted(TopLevelItem item) throws IOException { - // could call ItemListener.onDeleted + ItemListener.fireOnDeleted(item); items.remove(item.getName()); + for (View v : views) { + v.onJobRenamed(item, item.getName(), null); + } } @Override public boolean canAdd(TopLevelItem item) { -- GitLab From 3b8fff81e88f3369ffedf3134ec55dcde6407215 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 18 Dec 2013 17:45:24 -0500 Subject: [PATCH 0600/1630] Noting API anomaly. --- core/src/main/java/hudson/model/ItemGroup.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/hudson/model/ItemGroup.java b/core/src/main/java/hudson/model/ItemGroup.java index 1a7b5885c8..f285767bc4 100644 --- a/core/src/main/java/hudson/model/ItemGroup.java +++ b/core/src/main/java/hudson/model/ItemGroup.java @@ -77,6 +77,7 @@ public interface ItemGroup extends PersistenceRoot, ModelObject /** * Internal method. Called by {@link Item}s when they are renamed by users. + * This is not expected to call {@link ItemListener#onRenamed}, inconsistent with {@link #onDeleted}. */ void onRenamed(T item, String oldName, String newName) throws IOException; -- GitLab From 6c71a664b3f3427f975c965a0153b37409d921d5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 18 Dec 2013 18:02:27 -0800 Subject: [PATCH 0601/1630] creating an RC branch --- changelog.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index f3772de41c..399d17018c 100644 --- a/changelog.html +++ b/changelog.html @@ -54,6 +54,14 @@ Upcoming changes + + + - - -

      What's new in 1.544 (2013/12/15)

        -- GitLab From 168c50c4d3e37921f35f2644e24295f1c7e29cae Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 18 Dec 2013 18:02:32 -0800 Subject: [PATCH 0602/1630] the trunk is toward 1.546-SNAPSHOT --- cli/pom.xml | 2 +- core/pom.xml | 2 +- plugins/pom.xml | 8 ++++---- pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 6328a2d6af..99efb2d72a 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.545-SNAPSHOT + 1.546-SNAPSHOT cli diff --git a/core/pom.xml b/core/pom.xml index adae6bbacb..de95800900 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.545-SNAPSHOT + 1.546-SNAPSHOT ../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index fd0e915227..51f0dfa01f 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -11,7 +11,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.545-SNAPSHOT + 1.546-SNAPSHOT pom diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 710cd92807..b43b8f16e3 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1680,7 +1680,7 @@ public abstract class AbstractProject

        ,R extends A public void renameTo(String newName) throws IOException { super.renameTo(newName); // Update locations inside builds cache - builds.updateBaseDir(getBuildDir(), false); + builds.updateBaseDir(getBuildDir()); } protected final synchronized > diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java index 38c2f9805f..7b2515abe6 100644 --- a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java +++ b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java @@ -214,11 +214,10 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i * Updates base directory location after directory changes. * This method should be used on jobs renaming, etc. * @param dir Directory location - * @param reloadBuilds Purges cache after the directory update + * @since 1.546 */ - public final void updateBaseDir(File dir, boolean reloadBuilds) { + public final void updateBaseDir(File dir) { this.dir = dir; - purgeCache(); } /** @@ -230,6 +229,7 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i */ public void purgeCache() { index = new Index(); + fullyLoaded = false; loadIdOnDisk(); } -- GitLab From 9f23c0bdb3a3ed6485e161ff5c57ebba64f88035 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 23 Dec 2013 12:30:51 -0500 Subject: [PATCH 0616/1630] JavaScript error when showing a FormException after Apply is clicked. Related to JENKINS-20772 but probably not the same. --- core/src/main/java/hudson/model/Descriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java index e0cc80c5ea..1d36481101 100644 --- a/core/src/main/java/hudson/model/Descriptor.java +++ b/core/src/main/java/hudson/model/Descriptor.java @@ -967,7 +967,7 @@ public abstract class Descriptor> implements Saveable { public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException { if (FormApply.isApply(req)) { - FormApply.applyResponse("notificationBar.show(" + quote(getMessage())+ ",notificationBar.defaultOptions.ERROR)") + FormApply.applyResponse("notificationBar.show(" + quote(getMessage())+ ",notificationBar.ERROR)") .generateResponse(req, rsp, node); } else { // for now, we can't really use the field name that caused the problem. -- GitLab From 9e5817adbbf1b8c258c24281d0f61b40b7507cb3 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 23 Dec 2013 12:31:58 -0500 Subject: [PATCH 0617/1630] [FIXED JENKINS-17401] Behave gracefully if the user tries to rename a job using the Apply button. --- core/src/main/java/hudson/model/Job.java | 7 ++++++- core/src/main/resources/hudson/model/Messages.properties | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 29a7cd9425..902e0fbdf5 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -54,6 +54,7 @@ import hudson.util.DescribableList; import hudson.util.FormApply; import hudson.util.Graph; import hudson.util.ProcessTree; +import hudson.util.QuotedStringTokenizer; import hudson.util.RunList; import hudson.util.ShiftedCategoryAxis; import hudson.util.StackedAreaRenderer2; @@ -1144,7 +1145,11 @@ public abstract class Job, RunT extends Run Date: Mon, 23 Dec 2013 13:22:43 -0500 Subject: [PATCH 0618/1630] [FIXED JENKINS-20772] Properly render response in case Apply results in an error page. --- core/src/main/resources/lib/form/apply/apply.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/resources/lib/form/apply/apply.js b/core/src/main/resources/lib/form/apply/apply.js index 824ab8665e..35c7433ad0 100644 --- a/core/src/main/resources/lib/form/apply/apply.js +++ b/core/src/main/resources/lib/form/apply/apply.js @@ -41,6 +41,8 @@ Behaviour.specify("INPUT.apply-button", 'apply', 0, function (e) { target.contentWindow.applyCompletionHandler(window); } else { // otherwise this is possibly an error from the server, so we need to render the whole content. + var doc = target.contentDocument || target.contentWindow.document; + $(containerId).appendChild(doc.getElementsByTagName('body')[0]); var r = YAHOO.util.Dom.getClientRegion(); responseDialog.cfg.setProperty("width",r.width*3/4+"px"); responseDialog.cfg.setProperty("height",r.height*3/4+"px"); -- GitLab From c7dcb99290548f82b39846f4db431ab2ceb326ae Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 23 Dec 2013 13:24:42 -0500 Subject: [PATCH 0619/1630] [JENKINS-17401] [JENKINS-20772] Noting. --- changelog.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changelog.html b/changelog.html index 35fb73406c..2ffbebaf4c 100644 --- a/changelog.html +++ b/changelog.html @@ -58,6 +58,12 @@ Upcoming changes

      • Builds disappear after renaming a job. (issue 18678) +
      • + When clicking Apply to rename a job, tell the user that Save must be used instead. + (issue 17401) +
      • + When clicking Apply results in an exception (error page), show it, rather than creating an empty dialog. + (issue 20772)
      -- GitLab From 6a9ce7f9332bddfcf92805ade444583bb5067e77 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 23 Dec 2013 14:10:12 -0500 Subject: [PATCH 0620/1630] Incorrect filename in error. --- core/src/main/java/hudson/model/AbstractItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index 44f9993945..1380335633 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -588,7 +588,7 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet new StreamResult(out)); out.close(); } catch (TransformerException e) { - throw new IOException("Failed to persist configuration.xml", e); + throw new IOException("Failed to persist config.xml", e); } // try to reflect the changes by reloading -- GitLab From 28e403ac055f137975b29713a5e8e0cc85646a41 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 23 Dec 2013 14:59:54 -0500 Subject: [PATCH 0621/1630] Providing a documented abstraction for Items.updatingByXml. (Turns out cloudbees-template at least needs this, and it is possible other things besides Trigger could use it too.) --- .../main/java/hudson/model/AbstractItem.java | 13 ++++---- .../java/hudson/model/AbstractProject.java | 5 +-- .../java/hudson/model/ItemGroupMixIn.java | 30 ++++++++--------- core/src/main/java/hudson/model/Items.java | 32 ++++++++++++++++++- .../main/java/hudson/triggers/Trigger.java | 2 ++ 5 files changed, 58 insertions(+), 24 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index 1380335633..d23e36c90f 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -34,6 +34,7 @@ import hudson.cli.declarative.CLIMethod; import hudson.cli.declarative.CLIResolver; import hudson.model.listeners.ItemListener; import hudson.model.listeners.SaveableListener; +import hudson.remoting.Callable; import hudson.security.AccessControlled; import hudson.security.Permission; import hudson.security.ACL; @@ -593,12 +594,12 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet // try to reflect the changes by reloading new XmlFile(Items.XSTREAM, out.getTemporaryFile()).unmarshal(this); - Items.updatingByXml.set(true); - try { - onLoad(getParent(), getRootDir().getName()); - } finally { - Items.updatingByXml.set(false); - } + Items.whileUpdatingByXml(new Callable() { + @Override public Void call() throws IOException { + onLoad(getParent(), getRootDir().getName()); + return null; + } + }); Jenkins.getInstance().rebuildDependencyGraphAsync(); // if everything went well, commit this new version diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index b43b8f16e3..a8a992c585 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -326,8 +326,9 @@ public abstract class AbstractProject

      ,R extends A } this.builds = builds; triggers().setOwner(this); - for (Trigger t : triggers()) - t.start(this, Items.updatingByXml.get()); + for (Trigger t : triggers()) { + t.start(this, Items.currentlyUpdatingByXml()); + } if(scm==null) scm = new NullSCM(); // perhaps it was pointing to a plugin that no longer exists. diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java index 5c9bbab602..5abfb8cfd5 100644 --- a/core/src/main/java/hudson/model/ItemGroupMixIn.java +++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java @@ -25,6 +25,7 @@ package hudson.model; import hudson.Util; import hudson.model.listeners.ItemListener; +import hudson.remoting.Callable; import hudson.security.AccessControlled; import hudson.util.CopyOnWriteMap; import hudson.util.Function1; @@ -206,12 +207,12 @@ public abstract class ItemGroupMixIn { Util.copyFile(Items.getConfigFile(src).getFile(),Items.getConfigFile(result).getFile()); // reload from the new config - Items.updatingByXml.set(true); - try { - result = (T)Items.load(parent,result.getRootDir()); - } finally { - Items.updatingByXml.set(false); - } + final File rootDir = result.getRootDir(); + result = Items.whileUpdatingByXml(new Callable() { + @Override public T call() throws IOException { + return (T) Items.load(parent, rootDir); + } + }); result.onCopiedFrom(src); add(result); @@ -231,18 +232,17 @@ public abstract class ItemGroupMixIn { // place it as config.xml File configXml = Items.getConfigFile(getRootDirFor(name)).getFile(); - configXml.getParentFile().mkdirs(); + final File dir = configXml.getParentFile(); + dir.mkdirs(); try { IOUtils.copy(xml,configXml); // load it - TopLevelItem result; - Items.updatingByXml.set(true); - try { - result = (TopLevelItem)Items.load(parent,configXml.getParentFile()); - } finally { - Items.updatingByXml.set(false); - } + TopLevelItem result = Items.whileUpdatingByXml(new Callable() { + @Override public TopLevelItem call() throws IOException { + return (TopLevelItem) Items.load(parent, dir); + } + }); add(result); ItemListener.fireOnCreated(result); @@ -251,7 +251,7 @@ public abstract class ItemGroupMixIn { return result; } catch (IOException e) { // if anything fails, delete the config file to avoid further confusion - Util.deleteRecursive(configXml.getParentFile()); + Util.deleteRecursive(dir); throw e; } } diff --git a/core/src/main/java/hudson/model/Items.java b/core/src/main/java/hudson/model/Items.java index 5ca561beaa..a10c303aa5 100644 --- a/core/src/main/java/hudson/model/Items.java +++ b/core/src/main/java/hudson/model/Items.java @@ -30,6 +30,7 @@ import hudson.matrix.MatrixProject; import hudson.matrix.MatrixConfiguration; import hudson.XmlFile; import hudson.matrix.Axis; +import hudson.remoting.Callable; import hudson.triggers.Trigger; import hudson.util.DescriptorList; import hudson.util.EditDistance; @@ -61,12 +62,41 @@ public class Items { * @see Trigger#start * @since 1.482 */ - static final ThreadLocal updatingByXml = new ThreadLocal() { + private static final ThreadLocal updatingByXml = new ThreadLocal() { @Override protected Boolean initialValue() { return false; } }; + /** + * Runs a block while making {@link #currentlyUpdatingByXml} be temporarily true. + * Use this when you are creating or changing an item. + * @param a return value type (may be {@link Void}) + * @param an error type (may be {@link Error}) + * @param callable a block, typically running {@link #load} or {@link Item#onLoad} + * @return whatever {@code callable} returned + * @throws T anything {@code callable} throws + * @since 1.546 + */ + public static V whileUpdatingByXml(Callable callable) throws T { + updatingByXml.set(true); + try { + return callable.call(); + } finally { + updatingByXml.set(false); + } + } + + /** + * Checks whether we are in the middle of creating or configuring an item via XML. + * Used to determine the {@code newInstance} parameter for {@link Trigger#start}. + * @return true if {@link #whileUpdatingByXml} is currently being called, false for example when merely starting Jenkins or reloading from disk + * @since 1.546 + */ + public static boolean currentlyUpdatingByXml() { + return updatingByXml.get(); + } + /** * Returns all the registered {@link TopLevelItemDescriptor}s. */ diff --git a/core/src/main/java/hudson/triggers/Trigger.java b/core/src/main/java/hudson/triggers/Trigger.java index e6650d8089..51b7bffbe3 100644 --- a/core/src/main/java/hudson/triggers/Trigger.java +++ b/core/src/main/java/hudson/triggers/Trigger.java @@ -58,6 +58,7 @@ import java.util.logging.Logger; import antlr.ANTLRException; import javax.annotation.CheckForNull; import edu.umd.cs.findbugs.annotations.SuppressWarnings; +import hudson.model.Items; /** * Triggers a {@link Build}. @@ -78,6 +79,7 @@ public abstract class Trigger implements Describable> * @param newInstance * True if this may be a newly created trigger first attached to the {@link Project} (generally if the project is being created or configured). * False if this is invoked for a {@link Project} loaded from disk. + * @see Items#currentlyUpdatingByXml */ public void start(J project, boolean newInstance) { this.job = project; -- GitLab From 3fe6ed7b78b89606f2375fd2885b61dd6ee0c0ee Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 23 Dec 2013 15:58:51 -0500 Subject: [PATCH 0622/1630] Make sure rebuildDependencyGraphAsync does not repeat work if called many times in quick succession. --- core/src/main/java/jenkins/model/Jenkins.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index b2d657faf0..21dc6c408a 100755 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -289,6 +289,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import static java.util.logging.Level.SEVERE; import java.util.logging.LogRecord; @@ -434,6 +435,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro private List jdks = new ArrayList(); private transient volatile DependencyGraph dependencyGraph; + private final transient AtomicBoolean dependencyGraphDirty = new AtomicBoolean(); /** * Currently active Views tab bar. @@ -3609,6 +3611,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro // volatile acts a as a memory barrier here and therefore guarantees // that graph is fully build, before it's visible to other threads dependencyGraph = graph; + dependencyGraphDirty.set(false); } /** @@ -3621,10 +3624,13 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro * @since 1.522 */ public Future rebuildDependencyGraphAsync() { - return MasterComputer.threadPoolForRemoting.submit(new java.util.concurrent.Callable() { + dependencyGraphDirty.set(true); + return Timer.get().submit(new java.util.concurrent.Callable() { @Override public DependencyGraph call() throws Exception { - rebuildDependencyGraph(); + if (dependencyGraphDirty.get()) { + rebuildDependencyGraph(); + } return dependencyGraph; } }); -- GitLab From 1805b90a31430b88576fa943807afab99506bbad Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 23 Dec 2013 16:17:19 -0500 Subject: [PATCH 0623/1630] rebuildDependencyGraphAsync can wait a fraction of a second to improve the chances that events will be coalesced. --- core/src/main/java/jenkins/model/Jenkins.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 21dc6c408a..0772b093f6 100755 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -3625,7 +3625,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro */ public Future rebuildDependencyGraphAsync() { dependencyGraphDirty.set(true); - return Timer.get().submit(new java.util.concurrent.Callable() { + return Timer.get().schedule(new java.util.concurrent.Callable() { @Override public DependencyGraph call() throws Exception { if (dependencyGraphDirty.get()) { @@ -3633,7 +3633,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro } return dependencyGraph; } - }); + }, 500, TimeUnit.MILLISECONDS); } public DependencyGraph getDependencyGraph() { -- GitLab From b856cc2434b33ed7fec3492223e141747369bba3 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Mon, 23 Dec 2013 22:28:47 +0100 Subject: [PATCH 0624/1630] [JENKINS-20772] Only show error message in dialog This change removes the superfluous UI elements around the error message if possible. Otherwise, fall back to existing behavior of adding entire page to iframe. --- core/src/main/resources/jenkins/model/Jenkins/oops.jelly | 2 ++ core/src/main/resources/lib/form/apply/apply.js | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/jenkins/model/Jenkins/oops.jelly b/core/src/main/resources/jenkins/model/Jenkins/oops.jelly index 2a7e0910d2..5380997667 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/oops.jelly +++ b/core/src/main/resources/jenkins/model/Jenkins/oops.jelly @@ -41,6 +41,7 @@ THE SOFTWARE.

      ${%Oops!}

      +

      ${%problemHappened} ${%checkJIRA} @@ -51,6 +52,7 @@ THE SOFTWARE.

      ${%Stack trace}

      ${h.printThrowable(request.getAttribute('javax.servlet.error.exception'))}
      +
      \ No newline at end of file diff --git a/core/src/main/resources/lib/form/apply/apply.js b/core/src/main/resources/lib/form/apply/apply.js index 35c7433ad0..be6ddf57ac 100644 --- a/core/src/main/resources/lib/form/apply/apply.js +++ b/core/src/main/resources/lib/form/apply/apply.js @@ -12,7 +12,7 @@ Behaviour.specify("INPUT.apply-button", 'apply', 0, function (e) { }); responseDialog.setHeader("Error"); - responseDialog.setBody("
      "); + responseDialog.setBody("
      "); responseDialog.render(document.body); var target; // iframe @@ -42,7 +42,12 @@ Behaviour.specify("INPUT.apply-button", 'apply', 0, function (e) { } else { // otherwise this is possibly an error from the server, so we need to render the whole content. var doc = target.contentDocument || target.contentWindow.document; - $(containerId).appendChild(doc.getElementsByTagName('body')[0]); + var error = doc.getElementById('error-description'); + if (!error) { + // fallback if it's not a regular error dialog from oops.jelly: use the entire body + error = doc.getElementsByTagName('body')[0]; + } + $(containerId).appendChild(error); var r = YAHOO.util.Dom.getClientRegion(); responseDialog.cfg.setProperty("width",r.width*3/4+"px"); responseDialog.cfg.setProperty("height",r.height*3/4+"px"); -- GitLab From 78ffa3e9234209b9bb8361e9d3e003a8b15377ca Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 23 Dec 2013 17:40:08 -0500 Subject: [PATCH 0625/1630] =?UTF-8?q?Noting=20yet=20another=20weird=20prob?= =?UTF-8?q?lem=20with=20BuildTrigger=E2=80=99s=20reliance=20on=20Dependenc?= =?UTF-8?q?yGraph=20for=20its=20own=20execution.=20Since=20this=20is=20now?= =?UTF-8?q?=20(1.522)=20updated=20asynchronously,=20the=20value=20may=20no?= =?UTF-8?q?t=20actually=20be=20correct,=20potentially=20causing=20erratic?= =?UTF-8?q?=20behavior=20especially=20in=20tests.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/java/hudson/tasks/BuildTrigger.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java index ec2b4468c8..96e780a083 100644 --- a/core/src/main/java/hudson/tasks/BuildTrigger.java +++ b/core/src/main/java/hudson/tasks/BuildTrigger.java @@ -192,6 +192,7 @@ public class BuildTrigger extends Recorder implements DependencyDeclarer { public static boolean execute(AbstractBuild build, BuildListener listener) { PrintStream logger = listener.getLogger(); // Check all downstream Project of the project, not just those defined by BuildTrigger + // TODO this may not yet be up to date if rebuildDependencyGraphAsync has been used; need a method to wait for the last call made before now to finish final DependencyGraph graph = Jenkins.getInstance().getDependencyGraph(); List downstreamProjects = new ArrayList( graph.getDownstreamDependencies(build.getProject())); -- GitLab From 9b947ae8a239023482b8dcdec97d37425c42be8c Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Mon, 23 Dec 2013 23:46:01 +0100 Subject: [PATCH 0626/1630] [JENKINS-20772] Fix scrolling --- core/src/main/resources/lib/form/apply/apply.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/lib/form/apply/apply.js b/core/src/main/resources/lib/form/apply/apply.js index be6ddf57ac..9349740e75 100644 --- a/core/src/main/resources/lib/form/apply/apply.js +++ b/core/src/main/resources/lib/form/apply/apply.js @@ -49,8 +49,18 @@ Behaviour.specify("INPUT.apply-button", 'apply', 0, function (e) { } $(containerId).appendChild(error); var r = YAHOO.util.Dom.getClientRegion(); - responseDialog.cfg.setProperty("width",r.width*3/4+"px"); - responseDialog.cfg.setProperty("height",r.height*3/4+"px"); + + var contentHeight = r.height*3/4; + var dialogStyleHeight = contentHeight+40; + var contentWidth = r.width*3/4; + var dialogStyleWidth = contentWidth+20; + + $(containerId).style.height = contentHeight+"px"; + $(containerId).style.width = contentWidth+"px"; + $(containerId).style.overflow = "scroll"; + + responseDialog.cfg.setProperty("width", dialogStyleWidth+"px"); + responseDialog.cfg.setProperty("height", dialogStyleHeight+"px"); responseDialog.center(); responseDialog.show(); } -- GitLab From fd97a2f5e858ae137935dcf56d3a95b74ba279fc Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 23 Dec 2013 18:08:48 -0500 Subject: [PATCH 0627/1630] Fingerprinter calls rebuildDependencyGraphAsync, so since this is now delayed by 500msec, tests incorrect as of 1.522 will now fail pretty reliably unless made to forcibly rebuild the graph. --- .../test/java/hudson/tasks/FingerprinterTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/src/test/java/hudson/tasks/FingerprinterTest.java b/test/src/test/java/hudson/tasks/FingerprinterTest.java index e8089cf008..1804a3649f 100644 --- a/test/src/test/java/hudson/tasks/FingerprinterTest.java +++ b/test/src/test/java/hudson/tasks/FingerprinterTest.java @@ -100,6 +100,8 @@ public class FingerprinterTest { j.assertBuildStatusSuccess(upstream.scheduleBuild2(0).get()); j.assertBuildStatusSuccess(downstream.scheduleBuild2(0).get()); + j.jenkins.rebuildDependencyGraph(); + List downstreamProjects = upstream.getDownstreamProjects(); List upstreamProjects = downstream.getUpstreamProjects(); @@ -118,6 +120,8 @@ public class FingerprinterTest { j.assertBuildStatusSuccess(upstream2.scheduleBuild2(0).get()); j.assertBuildStatusSuccess(downstream.scheduleBuild2(0).get()); + j.jenkins.rebuildDependencyGraph(); + List downstreamProjects = upstream.getDownstreamProjects(); List downstreamProjects2 = upstream2.getDownstreamProjects(); List upstreamProjects = downstream.getUpstreamProjects(); @@ -139,6 +143,8 @@ public class FingerprinterTest { j.assertBuildStatusSuccess(downstream.scheduleBuild2(0).get()); j.assertBuildStatusSuccess(downstream2.scheduleBuild2(0).get()); + j.jenkins.rebuildDependencyGraph(); + List downstreamProjects = upstream.getDownstreamProjects(); List upstreamProjects = downstream.getUpstreamProjects(); List upstreamProjects2 = downstream2.getUpstreamProjects(); @@ -176,6 +182,8 @@ public class FingerprinterTest { j.assertBuildStatusSuccess(p.scheduleBuild2(0).get()); j.assertBuildStatusSuccess(p.scheduleBuild2(0).get()); + Jenkins.getInstance().rebuildDependencyGraph(); + List upstreamProjects = p.getUpstreamProjects(); List downstreamProjects = p.getDownstreamProjects(); @@ -195,6 +203,8 @@ public class FingerprinterTest { j.buildAndAssertSuccess(freestyleProject); j.waitUntilNoActivity(); + j.jenkins.rebuildDependencyGraph(); + RunList builds = freestyleProject.getBuilds(); assertEquals("There should only be one FreestyleBuild", 1, builds.size()); FreeStyleBuild build = builds.iterator().next(); @@ -300,6 +310,8 @@ public class FingerprinterTest { Fingerprint f = j.jenkins._getFingerprint(Util.getDigestOf(singleContents[0]+"\n")); assertEquals(3,f.getUsages().size()); + j.jenkins.rebuildDependencyGraph(); + assertEquals(Arrays.asList(p1), p2.getUpstreamProjects()); assertEquals(Arrays.asList(p1), p3.getUpstreamProjects()); assertEquals(new HashSet(Arrays.asList(p2,p3)), new HashSet(p1.getDownstreamProjects())); @@ -308,6 +320,8 @@ public class FingerprinterTest { p3.delete(); new FingerprintCleanupThread().execute(StreamTaskListener.fromStdout()); + j.jenkins.rebuildDependencyGraph(); + // records for p3 should have been deleted now assertEquals(2,f.getUsages().size()); assertEquals(Arrays.asList(p1), p2.getUpstreamProjects()); -- GitLab From 1e849c0ed45c1387d28237ade9696d18d67b899c Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Tue, 24 Dec 2013 12:04:55 +0400 Subject: [PATCH 0628/1630] Renamed "Run Command" to "Run Shell Command" The original name is quite confusing for users, because they usually want to run Batch scripts inside this installer. "Execute Batch Command" is available inside "extra-tool-installers" plugin, so there's no need to implement such installer inside the core. Related to: https://issues.jenkins-ci.org/browse/JENKINS-20635 Signed-off-by: Oleg Nenashev --- core/src/main/resources/hudson/tools/Messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/tools/Messages.properties b/core/src/main/resources/hudson/tools/Messages.properties index 7cfad94889..0bd14fd358 100644 --- a/core/src/main/resources/hudson/tools/Messages.properties +++ b/core/src/main/resources/hudson/tools/Messages.properties @@ -21,7 +21,7 @@ # THE SOFTWARE. ToolLocationNodeProperty.displayName=Tool Locations -CommandInstaller.DescriptorImpl.displayName=Run Command +CommandInstaller.DescriptorImpl.displayName=Run Shell Command CommandInstaller.no_command=Must provide a command to run. CommandInstaller.no_toolHome=Must provide a tool home directory. JDKInstaller.FailedToInstallJDK=Failed to install JDK. Exit code={0} -- GitLab From 0552aceb663993686e09be3d002a7470319e61b6 Mon Sep 17 00:00:00 2001 From: stephlag Date: Tue, 31 Dec 2013 11:00:16 +0100 Subject: [PATCH 0629/1630] Added some french translations --- .../main/resources/hudson/Messages_fr.properties | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/Messages_fr.properties b/core/src/main/resources/hudson/Messages_fr.properties index bcedd99861..8859924c56 100644 --- a/core/src/main/resources/hudson/Messages_fr.properties +++ b/core/src/main/resources/hudson/Messages_fr.properties @@ -20,6 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. +FilePath.did_not_manage_to_validate_may_be_too_sl=Impossible de valider {0} (peut-\u00eatre est-ce trop lent) FilePath.validateAntFileMask.whitespaceSeprator=\ Les espaces ne peuvent plus \u00eatre utilis\u00e9s comme s\u00e9parateurs. Merci d''utiliser maintenant '','' comme s\u00e9parateur \u00e0 la place. FilePath.validateAntFileMask.doesntMatchAndSuggest=\ @@ -27,7 +28,7 @@ FilePath.validateAntFileMask.doesntMatchAndSuggest=\ FilePath.validateAntFileMask.portionMatchAndSuggest=''{0}'' ne correspond \u00e0 rien, m\u00eame si ''{1}'' existe FilePath.validateAntFileMask.portionMatchButPreviousNotMatchAndSuggest=''{0}'' ne correspond \u00e0 rien : ''{1}'' existe mais pas ''{2}'' FilePath.validateAntFileMask.doesntMatchAnything=''{0}'' ne correspond \u00e0 rien -FilePath.validateAntFileMask.doesntMatchAnythingAndSuggest=''{0}'' ne correspond \u00e0 rien : m\u00eame ''{1}'' n'existe pas +FilePath.validateAntFileMask.doesntMatchAnythingAndSuggest=''{0}'' ne correspond \u00e0 rien : m\u00eame ''{1}'' n''existe pas FilePath.validateRelativePath.wildcardNotAllowed=L''utilisation des Wildcard n''est pas autoris\u00e9e ici FilePath.validateRelativePath.notFile=''{0}'' n''est pas un fichier @@ -35,6 +36,8 @@ FilePath.validateRelativePath.notDirectory=''{0}'' n''est pas un r\u00e9pertoire FilePath.validateRelativePath.noSuchFile=Aucun fichier correspondant : ''{0}'' FilePath.validateRelativePath.noSuchDirectory=Aucun r\u00e9pertoire correspondant : ''{0}'' +PluginManager.PluginDoesntSupportDynamicLoad.RestartRequired={0} plugin doesn\u2019t support dynamic loading. Jenkins needs to be restarted for the update to take effect +PluginManager.PluginIsAlreadyInstalled.RestartRequired=Le plugin {0} est d\u00e9j\u00e0 install\u00e9. Jenkins doit \u00eatre red\u00e9marr\u00e9 pour que la mise \u00e0 jour soit effective. Util.millisecond={0} ms Util.second={0} s Util.minute={0} mn @@ -52,6 +55,16 @@ FilePath.TildaDoesntWork=''~'' n''est support\u00e9 que sur les shells Unix. PluginManager.DisplayName=Gestion des plugins PluginManager.PortNotANumber=Le port n''est pas un nombre PluginManager.PortNotInRange=Le port n''est pas dans l''intervalle de {0} \u00e0 {1} +PluginManager.UploadPluginsPermission.Description=\ + La permission "upload plugin" autorise un utilisateur \u00e0 uploader des plugins. +PluginManager.ConfigureUpdateCenterPermission.Description=\ + The "configure update center" permission allows a user to \ + configure update sites and proxy settings. AboutJenkins.DisplayName=A propos de Jenkins AboutJenkins.Description=Afficher les informations de version et de licence + +ProxyConfiguration.TestUrlRequired=Test URL is required. +ProxyConfiguration.FailedToConnectViaProxy=Failed to connect to {0}. +ProxyConfiguration.FailedToConnect=Failed to connect to {0} (code {1}). +ProxyConfiguration.Success=Success -- GitLab From 6cc74f511f4758d56d32857650833a35b51feb91 Mon Sep 17 00:00:00 2001 From: stephlag Date: Tue, 31 Dec 2013 11:13:26 +0100 Subject: [PATCH 0630/1630] Added some french translations --- .../main/resources/hudson/scheduler/Messages_fr.properties | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/hudson/scheduler/Messages_fr.properties b/core/src/main/resources/hudson/scheduler/Messages_fr.properties index 89a12ac2d4..3fa3e452df 100644 --- a/core/src/main/resources/hudson/scheduler/Messages_fr.properties +++ b/core/src/main/resources/hudson/scheduler/Messages_fr.properties @@ -21,6 +21,8 @@ # THE SOFTWARE. BaseParser.StartEndReversed=Voulez-vous dire {0}-{1}? -BaseParser.MustBePositive=L''interval doit \u00eatre une valeur positive. {0} est incorrect +BaseParser.MustBePositive=L''intervalle doit \u00eatre une valeur positive. {0} est incorrect BaseParser.OutOfRange={0} est une valeur invalide. Elle doit \u00eatre comprise entre {1} et {2} -CronTabList.InvalidInput=Entr\u00e9e invalide: "{0}": {1} \ No newline at end of file +CronTab.do_you_really_mean_every_minute_when_you=Voulez-vous vraiment dire "chaque minute" avec l''expression "{0}"? Peut-\u00eatre vouliez-vous dire "{1}"? +CronTab.spread_load_evenly_by_using_rather_than_=Etaler la charge de fa\u00e7on r\u00e9guli\u00e8re en utilisant \u2018{0}\u2019 plut\u00f4t que \u2018{1}\u2019 +CronTabList.InvalidInput=Entr\u00e9e invalide: "{0}": {1} -- GitLab From 8011acf02828a3aaa666af1b1db873af1031a11a Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 31 Dec 2013 11:49:34 -0500 Subject: [PATCH 0631/1630] [FIXED JENKINS-21183] Updated XStream to pick up NPE fix. --- changelog.html | 3 +++ core/pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index 2ffbebaf4c..a66ecd1ecf 100644 --- a/changelog.html +++ b/changelog.html @@ -61,6 +61,9 @@ Upcoming changes
    • When clicking Apply to rename a job, tell the user that Save must be used instead. (issue 17401) +
    • + Exception from XStream running Maven builds on strange Java versions. + (issue 21183)
    • When clicking Apply results in an exception (error page), show it, rather than creating an empty dialog. (issue 20772) diff --git a/core/pom.xml b/core/pom.xml index de95800900..0bb91ab4da 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -219,7 +219,7 @@ THE SOFTWARE. org.jvnet.hudson xstream - 1.4.4-jenkins-4 + 1.4.4-jenkins-5 jfree -- GitLab From 4d3549a17fe46209a614f63cd7bdfc2d4276b9b9 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 31 Dec 2013 12:42:31 -0800 Subject: [PATCH 0632/1630] [maven-release-plugin] prepare release jenkins-1.545 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- plugins/pom.xml | 8 ++++---- pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 6328a2d6af..c18d00e9ac 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.545-SNAPSHOT + 1.545 cli diff --git a/core/pom.xml b/core/pom.xml index adae6bbacb..9ce3f03174 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.545-SNAPSHOT + 1.545 ../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index fd0e915227..47f4695097 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -11,7 +11,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.545-SNAPSHOT + 1.545 pom +

      What's new in 1.545 (2013/12/31)

      • CannotResolveClassException breaks loading of entire containing folder, not just one job. @@ -76,7 +79,6 @@ Upcoming changes Avoiding serializing the owning build as part of a test result action, as this can lead to errors later. (issue 18410)
      -

      What's new in 1.544 (2013/12/15)

      • -- GitLab From f4a1af253346246c9382059924451ac92fcc1d17 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 31 Dec 2013 15:02:14 -0800 Subject: [PATCH 0635/1630] updated changelog as a part of the release --- debian/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/debian/changelog b/debian/debian/changelog index 2282db70a2..170dbbd7c5 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +jenkins (1.545) unstable; urgency=low + + * See http://jenkins-ci.org/changelog for more details. + + -- Kohsuke Kawaguchi Tue, 31 Dec 2013 13:46:12 -0800 + jenkins (1.544) unstable; urgency=low * See http://jenkins-ci.org/changelog for more details. -- GitLab From 162fc30b4ab61fbf983f6e17753858e07f8fb0ab Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 31 Dec 2013 16:00:02 -0800 Subject: [PATCH 0636/1630] creating an RC branch --- changelog.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index f0b2a795ac..53d1109327 100644 --- a/changelog.html +++ b/changelog.html @@ -54,6 +54,14 @@ Upcoming changes + + + - - -

        What's new in 1.545 (2013/12/31)

          -- GitLab From 36346813242797075a7b7aeb67480e25a002a1c2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 31 Dec 2013 16:00:07 -0800 Subject: [PATCH 0637/1630] the trunk is toward 1.547-SNAPSHOT --- cli/pom.xml | 2 +- core/pom.xml | 2 +- plugins/pom.xml | 8 ++++---- pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 99efb2d72a..8d6988b739 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.546-SNAPSHOT + 1.547-SNAPSHOT cli diff --git a/core/pom.xml b/core/pom.xml index 0bb91ab4da..917fde65f3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.546-SNAPSHOT + 1.547-SNAPSHOT ../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 51f0dfa01f..fa841fa7a1 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -11,7 +11,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.546-SNAPSHOT + 1.547-SNAPSHOT pom diff --git a/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java b/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java index 709908d688..d74d8fd877 100644 --- a/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java +++ b/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java @@ -87,7 +87,7 @@ public class AggregatedTestResultPublisher extends Recorder { public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { // add a TestResult just so that it can show up later. - build.addAction(new TestResultAction(jobs, includeFailedBuilds)); + build.addAction(new TestResultAction(jobs, includeFailedBuilds, build)); return true; } @@ -131,11 +131,7 @@ public class AggregatedTestResultPublisher extends Recorder { private transient List didntRun; private transient List noFingerprints; - public TestResultAction(String jobs, boolean includeFailedBuilds) { - this(jobs, includeFailedBuilds, null); - } - - @Deprecated + @SuppressWarnings("deprecation") // calls getProject in constructor, so needs owner immediately public TestResultAction(String jobs, boolean includeFailedBuilds, AbstractBuild owner) { super(owner); this.includeFailedBuilds = includeFailedBuilds; diff --git a/test/src/test/java/hudson/tasks/test/AggregatedTestResultPublisherTest.java b/test/src/test/java/hudson/tasks/test/AggregatedTestResultPublisherTest.java index 1026d3a1a4..320cd09665 100644 --- a/test/src/test/java/hudson/tasks/test/AggregatedTestResultPublisherTest.java +++ b/test/src/test/java/hudson/tasks/test/AggregatedTestResultPublisherTest.java @@ -167,7 +167,7 @@ public class AggregatedTestResultPublisherTest { addFingerprinterToProject(downstreamProject, singleContents, singleFiles); upstreamProject.getPublishersList().add(new BuildTrigger(ImmutableList.of(downstreamProject), Result.SUCCESS)); - upstreamProject.getPublishersList().add(new AggregatedTestResultPublisher(TEST_PROJECT_NAME)); + upstreamProject.getPublishersList().add(new AggregatedTestResultPublisher(null)); j.jenkins.rebuildDependencyGraph(); } -- GitLab From b7d4c6a41407f8b621d5b1263585c07e71f507cc Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 2 Jan 2014 15:00:01 -0500 Subject: [PATCH 0640/1630] The jenkins_main_trunk job has been retired, so for now just skip these tests when running on any Jenkins server. --- test/src/test/groovy/hudson/cli/BuildCommandTest.groovy | 4 ++-- test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy | 2 +- test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy | 2 +- test/src/test/java/hudson/tasks/FingerprinterTest.java | 2 +- .../test/java/hudson/tasks/junit/JUnitResultArchiverTest.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/src/test/groovy/hudson/cli/BuildCommandTest.groovy b/test/src/test/groovy/hudson/cli/BuildCommandTest.groovy index 3c892fdb8a..6593d04e85 100644 --- a/test/src/test/groovy/hudson/cli/BuildCommandTest.groovy +++ b/test/src/test/groovy/hudson/cli/BuildCommandTest.groovy @@ -141,7 +141,7 @@ public class BuildCommandTest { } @Test void consoleOutput() { - Assume.assumeFalse("Started test0 #1", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL"))) + Assume.assumeFalse("Started test0 #1", System.getenv("JOB_URL") != null); def p = j.createFreeStyleProject() def cli = new CLI(j.URL) try { @@ -156,7 +156,7 @@ public class BuildCommandTest { } @Test void consoleOutputWhenBuildSchedulingRefused() { - Assume.assumeFalse("Started test0 #1", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL"))) + Assume.assumeFalse("Started test0 #1", System.getenv("JOB_URL") != null); def p = j.createFreeStyleProject() def cli = new CLI(j.URL) try { diff --git a/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy b/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy index f55904a354..f562ba6cae 100644 --- a/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy +++ b/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy @@ -110,7 +110,7 @@ public class MatrixProjectTest { */ @Test public void testBuildAxisInMaven() throws Exception { - Assume.assumeFalse("Not a v4.0.0 POM. for project org.jvnet.maven-antrun-extended-plugin:maven-antrun-extended-plugin at /home/jenkins/.m2/repository/org/jvnet/maven-antrun-extended-plugin/maven-antrun-extended-plugin/1.40/maven-antrun-extended-plugin-1.40.pom", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL"))); + Assume.assumeFalse("Not a v4.0.0 POM. for project org.jvnet.maven-antrun-extended-plugin:maven-antrun-extended-plugin at /home/jenkins/.m2/repository/org/jvnet/maven-antrun-extended-plugin/maven-antrun-extended-plugin/1.40/maven-antrun-extended-plugin-1.40.pom", System.getenv("JOB_URL") != null); MatrixProject p = createMatrixProject(); Maven.MavenInstallation maven = j.configureDefaultMaven(); p.getBuildersList().add(new Maven('-Dprop=${db} validate',maven.getName())); diff --git a/test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy b/test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy index 9e994a88eb..1d121b1864 100644 --- a/test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy +++ b/test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy @@ -44,7 +44,7 @@ public class UpdateCenter2Test { * Makes sure a plugin installs fine. */ @Test void install() { - Assume.assumeFalse("SocketTimeoutException from goTo due to GET http://localhost:…/update-center.json?…", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL"))) + Assume.assumeFalse("SocketTimeoutException from goTo due to GET http://localhost:…/update-center.json?…", System.getenv("JOB_URL") != null); UpdateSite.neverUpdate = false; j.createWebClient().goTo("") // load the metadata def job = j.jenkins.updateCenter.getPlugin("changelog-history").deploy().get(); // this seems like one of the smallest plugin diff --git a/test/src/test/java/hudson/tasks/FingerprinterTest.java b/test/src/test/java/hudson/tasks/FingerprinterTest.java index 1804a3649f..8236418f51 100644 --- a/test/src/test/java/hudson/tasks/FingerprinterTest.java +++ b/test/src/test/java/hudson/tasks/FingerprinterTest.java @@ -297,7 +297,7 @@ public class FingerprinterTest { @Bug(18417) @Test public void fingerprintCleanup() throws Exception { - Assume.assumeFalse("for p3.upstreamProjects expected:<[hudson.model.FreeStyleProject@590e5b8[test0]]> but was:<[]>", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL"))); + Assume.assumeFalse("for p3.upstreamProjects expected:<[hudson.model.FreeStyleProject@590e5b8[test0]]> but was:<[]>", System.getenv("JOB_URL") != null); // file names shouldn't matter FreeStyleProject p1 = createFreeStyleProjectWithFingerprints(singleContents, singleFiles); FreeStyleProject p2 = createFreeStyleProjectWithFingerprints(singleContents, singleFiles2); diff --git a/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java b/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java index 370ae36bd5..27c625249e 100644 --- a/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java +++ b/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java @@ -77,7 +77,7 @@ public class JUnitResultArchiverTest { @LocalData @Test public void slave() throws Exception { - Assume.assumeFalse("TimeoutException from basic", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL"))); + Assume.assumeFalse("TimeoutException from basic", System.getenv("JOB_URL") != null); DumbSlave s = j.createOnlineSlave(); project.setAssignedLabel(s.getSelfLabel()); -- GitLab From 38afe1650203378295a99cc472a8777718afa427 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Fri, 3 Jan 2014 00:21:08 +0400 Subject: [PATCH 0641/1630] [JENKINS-21202] - Generalization of Command installers This change adds an AbstractCommandInstaller, which can be extended for every script-based installation command. Related to https://issues.jenkins-ci.org/browse/JENKINS-21202 Signed-off-by: Oleg Nenashev --- .../tools/AbstractCommandInstaller.java | 119 ++++++++++++++++++ .../java/hudson/tools/CommandInstaller.java | 81 ++---------- .../config.jelly | 0 .../config_da.properties | 0 .../config_de.properties | 0 .../config_es.properties | 0 .../config_fr.properties | 0 .../config_ja.properties | 0 .../config_nl.properties | 0 .../config_pt_BR.properties | 0 .../config_ru.properties | 0 .../config_zh_CN.properties | 0 .../config_zh_TW.properties | 0 .../help-command.html | 0 .../help-command_de.html | 0 .../help-command_ja.html | 0 .../help-command_zh_CN.html | 0 .../help-command_zh_TW.html | 0 .../help-toolHome.html | 0 .../help-toolHome_de.html | 0 .../help-toolHome_zh_CN.html | 0 .../help-toolHome_zh_TW.html | 0 .../help.html | 0 .../help_de.html | 0 .../help_ja.html | 0 .../help_zh_CN.html | 0 .../help_zh_TW.html | 0 27 files changed, 130 insertions(+), 70 deletions(-) create mode 100644 core/src/main/java/hudson/tools/AbstractCommandInstaller.java rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/config.jelly (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/config_da.properties (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/config_de.properties (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/config_es.properties (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/config_fr.properties (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/config_ja.properties (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/config_nl.properties (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/config_pt_BR.properties (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/config_ru.properties (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/config_zh_CN.properties (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/config_zh_TW.properties (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help-command.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help-command_de.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help-command_ja.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help-command_zh_CN.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help-command_zh_TW.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help-toolHome.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help-toolHome_de.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help-toolHome_zh_CN.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help-toolHome_zh_TW.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help_de.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help_ja.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help_zh_CN.html (100%) rename core/src/main/resources/hudson/tools/{CommandInstaller => AbstractCommandInstaller}/help_zh_TW.html (100%) diff --git a/core/src/main/java/hudson/tools/AbstractCommandInstaller.java b/core/src/main/java/hudson/tools/AbstractCommandInstaller.java new file mode 100644 index 0000000000..24d54b4073 --- /dev/null +++ b/core/src/main/java/hudson/tools/AbstractCommandInstaller.java @@ -0,0 +1,119 @@ +/* + * The MIT License + * + * Copyright 2009-2014 Sun Microsystems and contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package hudson.tools; + +import hudson.FilePath; +import hudson.model.Node; +import hudson.model.TaskListener; +import hudson.util.FormValidation; +import java.io.IOException; +import org.kohsuke.stapler.QueryParameter; + +/** + * A generic script-based installer. + * @since TODO: define a version + * @see BatchCommandInstaller + * @see CommandInstaller + * @author Oleg Nenashev + * + */ +public abstract class AbstractCommandInstaller extends ToolInstaller { + + /** + * Command to execute, similar to {@link CommandInterpreter#command}. + */ + private final String command; + private final String toolHome; + + public AbstractCommandInstaller(String label, String command, String toolHome) { + super(label); + this.command = fixCrLf(command); + this.toolHome = toolHome; + } + + public String getCommand() { + return command; + } + + public String getToolHome() { + return toolHome; + } + + public abstract String getCommandFileExtension(); + + /** + * Retrieves a call for remote script caller. + */ + public abstract String[] getCommandCall(FilePath script); + + @Override + public FilePath performInstallation(ToolInstallation tool, Node node, TaskListener log) throws IOException, InterruptedException { + FilePath dir = preferredLocation(tool, node); + // XXX support Windows batch scripts, Unix scripts with interpreter line, etc. (see CommandInterpreter subclasses) + FilePath script = dir.createTextTempFile("hudson", getCommandFileExtension(), command); + try { + String cmd[] = getCommandCall(script); + int r = node.createLauncher(log).launch().cmds(cmd).stdout(log).pwd(dir).join(); + if (r != 0) { + throw new IOException("Command returned status " + r); + } + } finally { + script.delete(); + } + return dir.child(getToolHome()); + } + + /** + * Fix CR/LF and always make it Unix style. + */ + //TODO: replace by a Windows style + private static String fixCrLf(String s) { + // eliminate CR + int idx; + while ((idx = s.indexOf("\r\n")) != -1) { + s = s.substring(0, idx) + s.substring(idx + 1); + } + return s; + } + + public static abstract class Descriptor + extends ToolInstallerDescriptor { + + public FormValidation doCheckCommand(@QueryParameter String value) { + if (value.length() > 0) { + return FormValidation.ok(); + } else { + return FormValidation.error(Messages.CommandInstaller_no_command()); + } + } + + public FormValidation doCheckToolHome(@QueryParameter String value) { + if (value.length() > 0) { + return FormValidation.ok(); + } else { + return FormValidation.error(Messages.CommandInstaller_no_command()); + } + } + } +} diff --git a/core/src/main/java/hudson/tools/CommandInstaller.java b/core/src/main/java/hudson/tools/CommandInstaller.java index bbcc18d6bb..b02137f0f5 100644 --- a/core/src/main/java/hudson/tools/CommandInstaller.java +++ b/core/src/main/java/hudson/tools/CommandInstaller.java @@ -26,95 +26,36 @@ package hudson.tools; import hudson.Extension; import hudson.FilePath; -import hudson.model.Node; -import hudson.model.TaskListener; -import hudson.tasks.CommandInterpreter; -import hudson.util.FormValidation; -import java.io.IOException; import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.QueryParameter; /** * Installs a tool by running an arbitrary shell command. * @since 1.305 */ -public class CommandInstaller extends ToolInstaller { - - /** - * Command to execute, similar to {@link CommandInterpreter#command}. - */ - private final String command; - - /** - * Resulting tool home directory. - */ - private final String toolHome; +public class CommandInstaller extends AbstractCommandInstaller { @DataBoundConstructor public CommandInstaller(String label, String command, String toolHome) { - super(label); - this.command = fixCrLf(command); - this.toolHome = toolHome; - } - - /** - * Fix CR/LF and always make it Unix style. - */ - private static String fixCrLf(String s) { - // eliminate CR - int idx; - while((idx=s.indexOf("\r\n"))!=-1) - s = s.substring(0,idx)+s.substring(idx+1); - return s; - } - - public String getCommand() { - return command; + super(label, command, toolHome); } - public String getToolHome() { - return toolHome; + @Override + public String getCommandFileExtension() { + return ".sh"; } - public FilePath performInstallation(ToolInstallation tool, Node node, TaskListener log) throws IOException, InterruptedException { - FilePath dir = preferredLocation(tool, node); - // TODO support Windows batch scripts, Unix scripts with interpreter line, etc. (see CommandInterpreter subclasses) - FilePath script = dir.createTextTempFile("hudson", ".sh", command); - try { - String[] cmd = {"sh", "-e", script.getRemote()}; - int r = node.createLauncher(log).launch().cmds(cmd).stdout(log).pwd(dir).join(); - if (r != 0) { - throw new IOException("Command returned status " + r); - } - } finally { - script.delete(); - } - return dir.child(toolHome); + @Override + public String[] getCommandCall(FilePath script) { + String[] cmd = {"sh", "-e", script.getRemote()}; + return cmd; } @Extension - public static class DescriptorImpl extends ToolInstallerDescriptor { + public static class DescriptorImpl extends Descriptor { + @Override public String getDisplayName() { return Messages.CommandInstaller_DescriptorImpl_displayName(); } - - public FormValidation doCheckCommand(@QueryParameter String value) { - if (value.length() > 0) { - return FormValidation.ok(); - } else { - return FormValidation.error(Messages.CommandInstaller_no_command()); - } - } - - public FormValidation doCheckToolHome(@QueryParameter String value) { - if (value.length() > 0) { - return FormValidation.ok(); - } else { - return FormValidation.error(Messages.CommandInstaller_no_toolHome()); - } - } - } - } diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config.jelly b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/config.jelly similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/config.jelly rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/config.jelly diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config_da.properties b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_da.properties similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/config_da.properties rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_da.properties diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config_de.properties b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_de.properties similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/config_de.properties rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_de.properties diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config_es.properties b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_es.properties similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/config_es.properties rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_es.properties diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config_fr.properties b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_fr.properties similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/config_fr.properties rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_fr.properties diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config_ja.properties b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_ja.properties similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/config_ja.properties rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_ja.properties diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config_nl.properties b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_nl.properties similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/config_nl.properties rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_nl.properties diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config_pt_BR.properties b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_pt_BR.properties similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/config_pt_BR.properties rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_pt_BR.properties diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config_ru.properties b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_ru.properties similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/config_ru.properties rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_ru.properties diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config_zh_CN.properties b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_zh_CN.properties similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/config_zh_CN.properties rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_zh_CN.properties diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config_zh_TW.properties b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_zh_TW.properties similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/config_zh_TW.properties rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/config_zh_TW.properties diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help-command.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help-command.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help-command_de.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_de.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help-command_de.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_de.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help-command_ja.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_ja.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help-command_ja.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_ja.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help-command_zh_CN.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_zh_CN.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help-command_zh_CN.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_zh_CN.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help-command_zh_TW.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_zh_TW.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help-command_zh_TW.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-command_zh_TW.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help-toolHome.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-toolHome.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help-toolHome.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-toolHome.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help-toolHome_de.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-toolHome_de.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help-toolHome_de.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-toolHome_de.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help-toolHome_zh_CN.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-toolHome_zh_CN.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help-toolHome_zh_CN.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-toolHome_zh_CN.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help-toolHome_zh_TW.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-toolHome_zh_TW.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help-toolHome_zh_TW.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help-toolHome_zh_TW.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help_de.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help_de.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help_de.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help_de.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help_ja.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help_ja.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help_ja.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help_ja.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help_zh_CN.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help_zh_CN.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help_zh_CN.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help_zh_CN.html diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/help_zh_TW.html b/core/src/main/resources/hudson/tools/AbstractCommandInstaller/help_zh_TW.html similarity index 100% rename from core/src/main/resources/hudson/tools/CommandInstaller/help_zh_TW.html rename to core/src/main/resources/hudson/tools/AbstractCommandInstaller/help_zh_TW.html -- GitLab From a7643e2df00c72761e2583d2be150e1f4521f323 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Fri, 3 Jan 2014 00:22:06 +0400 Subject: [PATCH 0642/1630] [FIXED JENKINS-21202] - Added a BatchCommandInstaller Related to https://issues.jenkins-ci.org/browse/JENKINS-21202 Signed-off-by: Oleg Nenashev --- .../hudson/tools/BatchCommandInstaller.java | 62 +++++++++++++++++++ .../hudson/tools/Messages.properties | 1 + 2 files changed, 63 insertions(+) create mode 100644 core/src/main/java/hudson/tools/BatchCommandInstaller.java diff --git a/core/src/main/java/hudson/tools/BatchCommandInstaller.java b/core/src/main/java/hudson/tools/BatchCommandInstaller.java new file mode 100644 index 0000000000..415dbb700f --- /dev/null +++ b/core/src/main/java/hudson/tools/BatchCommandInstaller.java @@ -0,0 +1,62 @@ +/* + * The MIT License + * + * Copyright (c) 2013, Oleg Nenashev + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package hudson.tools; + +import hudson.Extension; +import hudson.FilePath; +import org.kohsuke.stapler.DataBoundConstructor; + +/** + * Installs tool via script execution of Batch script. + * Inspired by "Command installer" from the Jenkins core. + * @since 0.1 + */ +public class BatchCommandInstaller extends AbstractCommandInstaller { + + @DataBoundConstructor + public BatchCommandInstaller(String label, String command, String toolHome) { + super(label, command, toolHome); + } + + @Override + public String getCommandFileExtension() { + return ".bat"; + } + + @Override + public String[] getCommandCall(FilePath script) { + String[] cmd = {"cmd", "/c", "call", script.getRemote()}; + return cmd; + } + + @Extension + public static class DescriptorImpl extends Descriptor { + + @Override + public String getDisplayName() { + return Messages.BatchCommandInstaller_DescriptorImpl_displayName(); + } + } +} diff --git a/core/src/main/resources/hudson/tools/Messages.properties b/core/src/main/resources/hudson/tools/Messages.properties index 0bd14fd358..a00ad9a24c 100644 --- a/core/src/main/resources/hudson/tools/Messages.properties +++ b/core/src/main/resources/hudson/tools/Messages.properties @@ -24,6 +24,7 @@ ToolLocationNodeProperty.displayName=Tool Locations CommandInstaller.DescriptorImpl.displayName=Run Shell Command CommandInstaller.no_command=Must provide a command to run. CommandInstaller.no_toolHome=Must provide a tool home directory. +BatchCommandInstaller.DescriptorImpl.displayName=Run Batch Command JDKInstaller.FailedToInstallJDK=Failed to install JDK. Exit code={0} JDKInstaller.RequireOracleAccount=Installing JDK requires Oracle account. Please enter your username/password JDKInstaller.UnableToInstallUntilLicenseAccepted=Unable to auto-install JDK until the license is accepted. -- GitLab From d29a90150c839855d4ff0c084c3cd838b48fab5c Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 2 Jan 2014 16:27:48 -0500 Subject: [PATCH 0643/1630] Introduced @RandomlyFails annotation to make it easier to skip unreliable functional tests. First tried using excludedGroups and trying to work around SUREFIRE-984. Made some progress, but not ideal since marked tests are omitted from output, rather than being listed as ignored. Throwing AssumptionViolatedException from JenkinsRule is much simpler and seems to work better. https://github.com/junit-team/junit/issues/116 notes its limitations. --- test/pom.xml | 2 + .../org/jvnet/hudson/test/JenkinsRule.java | 14 ++++++ .../org/jvnet/hudson/test/RandomlyFails.java | 48 +++++++++++++++++++ .../groovy/hudson/cli/BuildCommandTest.groovy | 6 +-- .../hudson/matrix/MatrixProjectTest.groovy | 4 +- .../hudson/model/UpdateCenter2Test.groovy | 4 +- .../java/hudson/tasks/FingerprinterTest.java | 4 +- .../tasks/junit/JUnitResultArchiverTest.java | 4 +- 8 files changed, 75 insertions(+), 11 deletions(-) create mode 100644 test/src/main/java/org/jvnet/hudson/test/RandomlyFails.java diff --git a/test/pom.xml b/test/pom.xml index b0aac53767..ced3f5bd08 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -42,6 +42,7 @@ THE SOFTWARE. 2 false + false @@ -187,6 +188,7 @@ THE SOFTWARE. true ${mavenDebug} ${project.build.directory} + ${ignore.random.failures} true ${concurrency} diff --git a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java index 7019fb23b4..6070505df0 100644 --- a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java +++ b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java @@ -215,6 +215,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.*; +import org.junit.internal.AssumptionViolatedException; import static org.junit.matchers.JUnitMatchers.containsString; import org.junit.rules.TemporaryFolder; @@ -314,6 +315,14 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction { * @throws Throwable if setup fails (which will disable {@code after} */ public void before() throws Throwable { + // Not ideal (https://github.com/junit-team/junit/issues/116) but basically works. + if (Boolean.getBoolean("ignore.random.failures")) { + RandomlyFails rf = testDescription.getAnnotation(RandomlyFails.class); + if (rf != null) { + throw new AssumptionViolatedException("Known to randomly fail: " + rf.value()); + } + } + env = new TestEnvironment(testDescription); env.pin(); recipe(); @@ -484,6 +493,11 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction { throw new BreakException(); } catch (BreakException e) {} + RandomlyFails rf = testDescription.getAnnotation(RandomlyFails.class); + if (rf != null) { + System.err.println("Note: known to randomly fail: " + rf.value()); + } + // dump threads ThreadInfo[] threadInfos = Functions.getThreadInfos(); Functions.ThreadGroupMap m = Functions.sortThreadsAndGetGroupMap(threadInfos); diff --git a/test/src/main/java/org/jvnet/hudson/test/RandomlyFails.java b/test/src/main/java/org/jvnet/hudson/test/RandomlyFails.java new file mode 100644 index 0000000000..fdade2051a --- /dev/null +++ b/test/src/main/java/org/jvnet/hudson/test/RandomlyFails.java @@ -0,0 +1,48 @@ +/* + * The MIT License + * + * Copyright 2014 Jesse Glick. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package org.jvnet.hudson.test; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import org.junit.Test; + +/** + * Marker for test methods which have been observed to fail for no easily understood reason. + * They may be useful to keep in sources so developers and certain CI jobs can run them, + * but failures should not block a validated merge build for example. + * Only effective on {@link Test}-annotated (but not {@link WithoutJenkins}-annotated) methods in a class using {@link JenkinsRule} + * when the system property {@code ignore.random.failures} is true. + * @since 1.547 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface RandomlyFails { + + /** Observed failure message or other explanation. */ + String value(); + +} diff --git a/test/src/test/groovy/hudson/cli/BuildCommandTest.groovy b/test/src/test/groovy/hudson/cli/BuildCommandTest.groovy index 6593d04e85..78978981b8 100644 --- a/test/src/test/groovy/hudson/cli/BuildCommandTest.groovy +++ b/test/src/test/groovy/hudson/cli/BuildCommandTest.groovy @@ -25,10 +25,10 @@ package hudson.cli import org.apache.commons.io.output.TeeOutputStream import static org.junit.Assert.* -import org.junit.Assume import org.junit.Rule import org.junit.Test import org.jvnet.hudson.test.JenkinsRule +import org.jvnet.hudson.test.RandomlyFails import org.jvnet.hudson.test.TestBuilder import org.jvnet.hudson.test.TestExtension @@ -140,8 +140,8 @@ public class BuildCommandTest { } } + @RandomlyFails("Started test0 #1") @Test void consoleOutput() { - Assume.assumeFalse("Started test0 #1", System.getenv("JOB_URL") != null); def p = j.createFreeStyleProject() def cli = new CLI(j.URL) try { @@ -155,8 +155,8 @@ public class BuildCommandTest { } } + @RandomlyFails("Started test0 #1") @Test void consoleOutputWhenBuildSchedulingRefused() { - Assume.assumeFalse("Started test0 #1", System.getenv("JOB_URL") != null); def p = j.createFreeStyleProject() def cli = new CLI(j.URL) try { diff --git a/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy b/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy index f562ba6cae..118f0bbe33 100644 --- a/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy +++ b/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy @@ -67,10 +67,10 @@ import java.util.concurrent.CountDownLatch import static hudson.model.Node.Mode.EXCLUSIVE import static org.junit.Assert.* -import org.junit.Assume import org.junit.Rule import org.junit.Test import org.jvnet.hudson.test.JenkinsRule +import org.jvnet.hudson.test.RandomlyFails import org.junit.rules.TemporaryFolder /** @@ -108,9 +108,9 @@ public class MatrixProjectTest { /** * Tests that axes are available as build variables in the Maven builds. */ + @RandomlyFails("Not a v4.0.0 POM. for project org.jvnet.maven-antrun-extended-plugin:maven-antrun-extended-plugin at /home/jenkins/.m2/repository/org/jvnet/maven-antrun-extended-plugin/maven-antrun-extended-plugin/1.40/maven-antrun-extended-plugin-1.40.pom") @Test public void testBuildAxisInMaven() throws Exception { - Assume.assumeFalse("Not a v4.0.0 POM. for project org.jvnet.maven-antrun-extended-plugin:maven-antrun-extended-plugin at /home/jenkins/.m2/repository/org/jvnet/maven-antrun-extended-plugin/maven-antrun-extended-plugin/1.40/maven-antrun-extended-plugin-1.40.pom", System.getenv("JOB_URL") != null); MatrixProject p = createMatrixProject(); Maven.MavenInstallation maven = j.configureDefaultMaven(); p.getBuildersList().add(new Maven('-Dprop=${db} validate',maven.getName())); diff --git a/test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy b/test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy index 1d121b1864..6a1a5ad66e 100644 --- a/test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy +++ b/test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy @@ -24,10 +24,10 @@ package hudson.model import org.jvnet.hudson.test.JenkinsRule +import org.jvnet.hudson.test.RandomlyFails import org.junit.Rule import org.junit.Test import static org.junit.Assert.* -import org.junit.Assume import hudson.model.UpdateCenter.DownloadJob.Success import hudson.model.UpdateSite @@ -43,8 +43,8 @@ public class UpdateCenter2Test { /** * Makes sure a plugin installs fine. */ + @RandomlyFails("SocketTimeoutException from goTo due to GET http://localhost:…/update-center.json?…") @Test void install() { - Assume.assumeFalse("SocketTimeoutException from goTo due to GET http://localhost:…/update-center.json?…", System.getenv("JOB_URL") != null); UpdateSite.neverUpdate = false; j.createWebClient().goTo("") // load the metadata def job = j.jenkins.updateCenter.getPlugin("changelog-history").deploy().get(); // this seems like one of the smallest plugin diff --git a/test/src/test/java/hudson/tasks/FingerprinterTest.java b/test/src/test/java/hudson/tasks/FingerprinterTest.java index 8236418f51..fb6924d6a2 100644 --- a/test/src/test/java/hudson/tasks/FingerprinterTest.java +++ b/test/src/test/java/hudson/tasks/FingerprinterTest.java @@ -47,13 +47,13 @@ import static org.junit.Assert.*; import hudson.util.StreamTaskListener; import jenkins.model.Jenkins; -import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.RandomlyFails; import org.jvnet.hudson.test.recipes.LocalData; /** @@ -294,10 +294,10 @@ public class FingerprinterTest { } @SuppressWarnings("unchecked") + @RandomlyFails("for p3.upstreamProjects expected:<[hudson.model.FreeStyleProject@590e5b8[test0]]> but was:<[]>") @Bug(18417) @Test public void fingerprintCleanup() throws Exception { - Assume.assumeFalse("for p3.upstreamProjects expected:<[hudson.model.FreeStyleProject@590e5b8[test0]]> but was:<[]>", System.getenv("JOB_URL") != null); // file names shouldn't matter FreeStyleProject p1 = createFreeStyleProjectWithFingerprints(singleContents, singleFiles); FreeStyleProject p2 = createFreeStyleProjectWithFingerprints(singleContents, singleFiles2); diff --git a/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java b/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java index 27c625249e..4d515e860e 100644 --- a/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java +++ b/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java @@ -37,12 +37,12 @@ import org.jvnet.hudson.test.recipes.LocalData; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import static org.junit.Assert.*; -import org.junit.Assume; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; +import org.jvnet.hudson.test.RandomlyFails; public class JUnitResultArchiverTest { @@ -75,9 +75,9 @@ public class JUnitResultArchiverTest { } + @RandomlyFails("TimeoutException from basic") @LocalData @Test public void slave() throws Exception { - Assume.assumeFalse("TimeoutException from basic", System.getenv("JOB_URL") != null); DumbSlave s = j.createOnlineSlave(); project.setAssignedLabel(s.getSelfLabel()); -- GitLab From 2669e4a86d72f2d8b67417812db8f52aa487f3de Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 3 Jan 2014 17:20:01 -0500 Subject: [PATCH 0644/1630] Split out windows-slaves-plugin. https://trello.com/c/MhG9Ksqa/12-windows-service-slave-launcher --- core/pom.xml | 11 +- .../java/hudson/ClassicPluginStrategy.java | 3 +- .../windows/ManagedWindowsServiceAccount.java | 114 ---- .../ManagedWindowsServiceConnector.java | 44 -- .../ManagedWindowsServiceLauncher.java | 529 ------------------ .../os/windows/WindowsRemoteFileSystem.java | 60 -- .../os/windows/WindowsRemoteLauncher.java | 126 ----- .../AnotherUser/config.groovy | 9 - .../AnotherUser/config_zh_TW.properties | 24 - .../config.groovy | 1 - .../config.jelly | 33 -- .../config_es.properties | 24 - .../config_ja.properties | 24 - .../config_zh_TW.properties | 24 - .../AccountInfo/config.groovy | 12 - .../AccountInfo/config_ja.properties | 24 - .../AccountInfo/config_zh_TW.properties | 24 - .../config.jelly | 46 -- .../config.properties | 3 - .../config_da.properties | 24 - .../config_de.properties | 6 - .../config_es.properties | 27 - .../config_fr.properties | 29 - .../config_ja.properties | 32 -- .../config_lv.properties | 5 - .../config_nl.properties | 24 - .../config_pt_BR.properties | 29 - .../config_sv_SE.properties | 24 - .../config_zh_TW.properties | 31 - .../help-host.html | 3 - .../help-host_fr.html | 3 - .../help-host_zh_TW.html | 3 - .../help-javaPath.html | 4 - .../help-javaPath_zh_TW.html | 4 - .../help-logOn.html | 10 - .../help-logOn_zh_TW.html | 8 - .../help-userName.html | 8 - .../help-userName_de.html | 8 - .../help-userName_fr.html | 8 - .../help-userName_ja.html | 7 - .../help-userName_zh_TW.html | 7 - .../ManagedWindowsServiceLauncher/help.jelly | 28 - .../help.properties | 3 - .../help_da.properties | 23 - .../help_de.properties | 4 - .../help_es.properties | 25 - .../help_fr.properties | 25 - .../help_ja.properties | 25 - .../help_pt_BR.properties | 28 - .../help_zh_TW.properties | 25 - .../hudson/os/windows/Messages.properties | 38 -- .../hudson/os/windows/Messages_da.properties | 36 -- .../hudson/os/windows/Messages_de.properties | 39 -- .../hudson/os/windows/Messages_es.properties | 38 -- .../hudson/os/windows/Messages_fr.properties | 35 -- .../hudson/os/windows/Messages_ja.properties | 37 -- .../os/windows/Messages_pt_BR.properties | 49 -- .../os/windows/Messages_zh_TW.properties | 38 -- licenseCompleter.groovy | 2 +- war/pom.xml | 6 + 60 files changed, 12 insertions(+), 1931 deletions(-) delete mode 100644 core/src/main/java/hudson/os/windows/ManagedWindowsServiceAccount.java delete mode 100644 core/src/main/java/hudson/os/windows/ManagedWindowsServiceConnector.java delete mode 100644 core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java delete mode 100644 core/src/main/java/hudson/os/windows/WindowsRemoteFileSystem.java delete mode 100644 core/src/main/java/hudson/os/windows/WindowsRemoteLauncher.java delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceAccount/AnotherUser/config.groovy delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceAccount/AnotherUser/config_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceAccount/config.groovy delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config.jelly delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config_es.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config_ja.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/AccountInfo/config.groovy delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/AccountInfo/config_ja.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/AccountInfo/config_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config.jelly delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_da.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_de.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_es.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_fr.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_ja.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_lv.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_nl.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_sv_SE.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-host.html delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-host_fr.html delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-host_zh_TW.html delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-javaPath.html delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-javaPath_zh_TW.html delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-logOn.html delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-logOn_zh_TW.html delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName.html delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_de.html delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_fr.html delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_ja.html delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_zh_TW.html delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help.jelly delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_da.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_de.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_es.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_fr.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_ja.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/os/windows/Messages.properties delete mode 100644 core/src/main/resources/hudson/os/windows/Messages_da.properties delete mode 100644 core/src/main/resources/hudson/os/windows/Messages_de.properties delete mode 100644 core/src/main/resources/hudson/os/windows/Messages_es.properties delete mode 100644 core/src/main/resources/hudson/os/windows/Messages_fr.properties delete mode 100644 core/src/main/resources/hudson/os/windows/Messages_ja.properties delete mode 100644 core/src/main/resources/hudson/os/windows/Messages_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/os/windows/Messages_zh_TW.properties diff --git a/core/pom.xml b/core/pom.xml index 917fde65f3..7b664fba0c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -517,14 +517,9 @@ THE SOFTWARE. 1.9 - org.jenkins-ci - jinterop-wmi - 1.1 - - - org.jenkins-ci - windows-remote-command - 1.4 + org.kohsuke.jinterop + j-interop + 2.0.6-kohsuke-1 org.kohsuke.metainf-services diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index f60166f34e..c8eb3f343c 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -272,7 +272,8 @@ public class ClassicPluginStrategy implements PluginStrategy { new DetachedPlugin("ldap","1.467.*","1.0"), new DetachedPlugin("pam-auth","1.467.*","1.0"), new DetachedPlugin("mailer","1.493.*","1.2"), - new DetachedPlugin("matrix-auth","1.535.*","1.0.2") + new DetachedPlugin("matrix-auth","1.535.*","1.0.2"), + new DetachedPlugin("windows-slaves","1.547.*","1.0") ); /** diff --git a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceAccount.java b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceAccount.java deleted file mode 100644 index c00c7bd236..0000000000 --- a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceAccount.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2012-, CloudBees, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package hudson.os.windows; - -import hudson.Extension; -import hudson.ExtensionPoint; -import hudson.model.AbstractDescribableImpl; -import hudson.model.Descriptor; -import hudson.os.windows.ManagedWindowsServiceLauncher.AccountInfo; -import hudson.util.Secret; -import org.kohsuke.stapler.DataBoundConstructor; - -/** - * Encapsulates how to login (a part of {@link ManagedWindowsServiceLauncher}). - * - * @author Kohsuke Kawaguchi - * @author Vincent Latombe - * @since 1.448 - */ -public abstract class ManagedWindowsServiceAccount extends AbstractDescribableImpl implements ExtensionPoint { - public abstract AccountInfo getAccount(ManagedWindowsServiceLauncher launcher); - - /** - * Logs in with the local system user. - * This is the default. - */ - public static final class LocalSystem extends ManagedWindowsServiceAccount { - @DataBoundConstructor - public LocalSystem() {} - - @Override - public AccountInfo getAccount(ManagedWindowsServiceLauncher launcher) { - return null; - } - - @Extension(ordinal=100) - public static class DescriptorImpl extends Descriptor { - @Override - public String getDisplayName() { - return "Use Local System User"; - } - } - } - - /** - * Logs in with the administrator user account supplied in {@link ManagedWindowsServiceLauncher}. - */ - public static final class Administrator extends ManagedWindowsServiceAccount { - @DataBoundConstructor - public Administrator() {} - - @Override - public AccountInfo getAccount(ManagedWindowsServiceLauncher launcher) { - return new AccountInfo(launcher.userName,Secret.toString(launcher.password)); - } - - @Extension - public static class DescriptorImpl extends Descriptor { - @Override - public String getDisplayName() { - return "Use Administrator account given above"; - } - } - } - - /** - * Logs in with a separate user. - */ - public static final class AnotherUser extends ManagedWindowsServiceAccount { - public final String userName; - public final Secret password; - - @DataBoundConstructor - public AnotherUser(String userName, Secret password) { - this.userName = userName; - this.password = password; - } - - @Override - public AccountInfo getAccount(ManagedWindowsServiceLauncher launcher) { - return new AccountInfo(userName,Secret.toString(password)); - } - - @Extension - public static class DescriptorImpl extends Descriptor { - @Override - public String getDisplayName() { - return "Log on using a different account"; - } - } - } - -} diff --git a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceConnector.java b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceConnector.java deleted file mode 100644 index 5b31689c5b..0000000000 --- a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceConnector.java +++ /dev/null @@ -1,44 +0,0 @@ -package hudson.os.windows; - -import hudson.Extension; -import hudson.model.TaskListener; -import hudson.slaves.ComputerConnector; -import hudson.slaves.ComputerConnectorDescriptor; -import hudson.util.Secret; -import org.kohsuke.stapler.DataBoundConstructor; - -import java.io.IOException; - -/** - * {@link ComputerConnector} that delegates to {@link ManagedWindowsServiceLauncher}. - * @author Kohsuke Kawaguchi - */ -public class ManagedWindowsServiceConnector extends ComputerConnector { - /** - * "[DOMAIN\\]USERNAME" to follow the Windows convention. - */ - public final String userName; - - public final Secret password; - - @DataBoundConstructor - public ManagedWindowsServiceConnector(String userName, String password) { - this.userName = userName; - this.password = Secret.fromString(password); - } - - @Override - public ManagedWindowsServiceLauncher launch(final String hostName, TaskListener listener) throws IOException, InterruptedException { - return new ManagedWindowsServiceLauncher(userName,Secret.toString(password),hostName); - } - - @Extension - public static class DescriptorImpl extends ComputerConnectorDescriptor { - public String getDisplayName() { - return Messages.ManagedWindowsServiceLauncher_DisplayName(); - } - - // used by Jelly - public static final Class CONFIG_DELEGATE_TO = ManagedWindowsServiceLauncher.class; - } -} diff --git a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java deleted file mode 100644 index cbdaa6acdd..0000000000 --- a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java +++ /dev/null @@ -1,529 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package hudson.os.windows; - -import static hudson.Util.copyStreamAndClose; -import static org.jvnet.hudson.wmi.Win32Service.Win32OwnProcess; - -import hudson.EnvVars; -import hudson.Extension; -import hudson.Util; -import hudson.model.*; -import hudson.os.windows.ManagedWindowsServiceAccount.AnotherUser; -import hudson.os.windows.ManagedWindowsServiceAccount.LocalSystem; -import hudson.remoting.Channel; -import hudson.remoting.Channel.Listener; -import hudson.remoting.SocketInputStream; -import hudson.remoting.SocketOutputStream; -import hudson.slaves.*; -import hudson.tools.JDKInstaller; -import hudson.tools.JDKInstaller.CPU; -import hudson.tools.JDKInstaller.Platform; -import hudson.util.DescribableList; -import hudson.util.IOUtils; -import hudson.util.Secret; -import hudson.util.jna.DotNet; - -import java.io.*; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.net.URL; -import java.net.UnknownHostException; -import java.util.logging.Level; -import java.util.logging.Logger; - -import jcifs.smb.NtlmPasswordAuthentication; -import jcifs.smb.SmbException; -import jcifs.smb.SmbFile; -import jenkins.model.Jenkins; - -import org.apache.commons.lang.StringUtils; -import org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.io.SAXReader; -import org.jinterop.dcom.common.JIDefaultAuthInfoImpl; -import org.jinterop.dcom.common.JIException; -import org.jinterop.dcom.core.JISession; -import org.jvnet.hudson.remcom.WindowsRemoteProcessLauncher; -import org.jvnet.hudson.wmi.SWbemServices; -import org.jvnet.hudson.wmi.WMI; -import org.jvnet.hudson.wmi.Win32Service; -import org.kohsuke.stapler.DataBoundConstructor; - -/** - * Windows slave installed/managed as a service entirely remotely - * - * @author Kohsuke Kawaguchi - */ -public class ManagedWindowsServiceLauncher extends ComputerLauncher { - - /** - * "[DOMAIN\\]USERNAME" to follow the Windows convention. - */ - public final String userName; - - public final Secret password; - - public final String vmargs; - - public final String javaPath; - - /** - * @deprecated Use {@link #account} - */ - public transient final AccountInfo logOn; - - /** - * Specifies the account used to run the service. - */ - private ManagedWindowsServiceAccount account; - - public static class LogOnOption { - public final String value; - - public final AccountInfo logOn; - - @DataBoundConstructor - public LogOnOption(String value, AccountInfo logOn) { - this.value = value; - this.logOn = logOn; - } - } - - public static class AccountInfo extends AbstractDescribableImpl { - public final String userName; - - public final Secret password; - - @DataBoundConstructor - public AccountInfo(String userName, String password) { - this.userName = userName; - this.password = Secret.fromString(password); - } - - @Extension - public static class DescriptorImpl extends Descriptor { - @Override - public String getDisplayName() { - return ""; // unused - } - } - } - - /** - * Host name to connect to. For compatibility reasons, null if the same with the slave name. - * @since 1.419 - */ - public final String host; - - public ManagedWindowsServiceLauncher(String userName, String password) { - this (userName, password, null); - } - - public ManagedWindowsServiceLauncher(String userName, String password, String host) { - this(userName, password, host, null, null); - } - - public ManagedWindowsServiceLauncher(String userName, String password, String host, AccountInfo account) { - this(userName,password,host,account==null ? new LocalSystem() : new AnotherUser(account.userName,account.password), null); - } - - public ManagedWindowsServiceLauncher(String userName, String password, String host, ManagedWindowsServiceAccount account, String vmargs) { - this(userName, password, host, account, vmargs, ""); - } - @DataBoundConstructor - public ManagedWindowsServiceLauncher(String userName, String password, String host, ManagedWindowsServiceAccount account, String vmargs, String javaPath) { - this.userName = userName; - this.password = Secret.fromString(password); - this.vmargs = Util.fixEmptyAndTrim(vmargs); - this.javaPath = Util.fixEmptyAndTrim(javaPath); - this.host = Util.fixEmptyAndTrim(host); - this.account = account==null ? new LocalSystem() : account; - this.logOn = null; - } - - public Object readResolve() { - if (logOn!=null) - account = new AnotherUser(logOn.userName,logOn.password); - return this; - } - - private JIDefaultAuthInfoImpl createAuth() { - String[] tokens = userName.split("\\\\"); - if(tokens.length==2) - return new JIDefaultAuthInfoImpl(tokens[0], tokens[1], Secret.toString(password)); - return new JIDefaultAuthInfoImpl("", userName, Secret.toString(password)); - } - - private NtlmPasswordAuthentication createSmbAuth() { - JIDefaultAuthInfoImpl auth = createAuth(); - return new NtlmPasswordAuthentication(auth.getDomain(), auth.getUserName(), auth.getPassword()); - } - - public ManagedWindowsServiceAccount getAccount() { - return account; - } - - private AccountInfo getLogOn() { - if (account==null) return null; - return account.getAccount(this); - } - - @Override - public void launch(final SlaveComputer computer, final TaskListener listener) throws IOException, InterruptedException { - try { - final PrintStream logger = listener.getLogger(); - final String name = determineHost(computer); - - logger.println(Messages.ManagedWindowsServiceLauncher_ConnectingTo(name)); - - InetAddress host = InetAddress.getByName(name); - - /* - Somehow this didn't work for me, so I'm disabling it. - */ - // ping check -// if (!host.isReachable(3000)) { -// logger.println("Failed to ping "+name+". Is this a valid reachable host name?"); -// // continue anyway, just in case it's just ICMP that's getting filtered -// } - - checkPort135Access(logger, name, host); - - JIDefaultAuthInfoImpl auth = createAuth(); - JISession session = JISession.createSession(auth); - session.setGlobalSocketTimeout(60000); - SWbemServices services = WMI.connect(session, name); - - - String path = computer.getNode().getRemoteFS(); - if (path.indexOf(':')==-1) throw new IOException("Remote file system root path of the slave needs to be absolute: "+path); - SmbFile remoteRoot = new SmbFile("smb://" + name + "/" + path.replace('\\', '/').replace(':', '$')+"/",createSmbAuth()); - - if(!remoteRoot.exists()) - remoteRoot.mkdirs(); - - String java = resolveJava(computer); - - try {// does Java exist? - logger.println("Checking if Java exists"); - WindowsRemoteProcessLauncher wrpl = new WindowsRemoteProcessLauncher(name,auth); - Process proc = wrpl.launch("\"" +java + "\" -version","c:\\"); - proc.getOutputStream().close(); - StringWriter console = new StringWriter(); - IOUtils.copy(proc.getInputStream(), console); - proc.getInputStream().close(); - int exitCode = proc.waitFor(); - if (exitCode==1) {// we'll get this error code if Java is not found - logger.println("No Java found. Downloading JDK"); - JDKInstaller jdki = new JDKInstaller("jdk-6u16-oth-JPR@CDS-CDS_Developer",true); - URL jdk = jdki.locate(listener, Platform.WINDOWS, CPU.i386); - - listener.getLogger().println("Installing JDK"); - copyStreamAndClose(jdk.openStream(), new SmbFile(remoteRoot, "jdk.exe").getOutputStream()); - - String javaDir = path + "\\jdk"; // this is where we install Java to - - WindowsRemoteFileSystem fs = new WindowsRemoteFileSystem(name, createSmbAuth()); - fs.mkdirs(javaDir); - - jdki.install(new WindowsRemoteLauncher(listener,wrpl), Platform.WINDOWS, - fs, listener, javaDir ,path+"\\jdk.exe"); - } else { - checkJavaVersion(logger, java, new BufferedReader(new StringReader(console.toString()))); - } - } catch (Exception e) { - e.printStackTrace(listener.error("Failed to prepare Java")); - return; - } - -// this just doesn't work --- trying to obtain the type or check the existence of smb://server/C$/ results in "access denied" -// {// check if the administrative share exists -// String fullpath = remoteRoot.getPath(); -// int idx = fullpath.indexOf("$/"); -// if (idx>=0) {// this must be true but be defensive since all we are trying to do here is a friendlier error check -// boolean exists; -// try { -// // SmbFile.exists() doesn't work on a share -// new SmbFile(fullpath.substring(0, idx + 2)).getType(); -// exists = true; -// } catch (SmbException e) { -// // on Windows XP that I was using for the test, if the share doesn't exist I get this error -// // a thread in jcifs library ML confirms this, too: -// // http://old.nabble.com/"The-network-name-cannot-be-found"-after-30-seconds-td18859163.html -// if (e.getNtStatus()== NtStatus.NT_STATUS_BAD_NETWORK_NAME) -// exists = false; -// else -// throw e; -// } -// if (!exists) { -// logger.println(name +" appears to be missing the administrative share "+fullpath.substring(idx-1,idx+1)/*C$*/); -// return; -// } -// } -// } - - String id = generateServiceId(path); - Win32Service slaveService = services.getService(id); - if(slaveService==null) { - logger.println(Messages.ManagedWindowsServiceLauncher_InstallingSlaveService()); - if(!DotNet.isInstalled(2,0, name, auth)) { - // abort the launch - logger.println(Messages.ManagedWindowsServiceLauncher_DotNetRequired()); - return; - } - - // copy exe - logger.println(Messages.ManagedWindowsServiceLauncher_CopyingSlaveExe()); - copyStreamAndClose(getClass().getResource("/windows-service/jenkins.exe").openStream(), new SmbFile(remoteRoot,"jenkins-slave.exe").getOutputStream()); - - copyStreamAndClose(getClass().getResource("/windows-service/jenkins.exe.config").openStream(), new SmbFile(remoteRoot,"jenkins-slave.exe.config").getOutputStream()); - - copySlaveJar(logger, remoteRoot); - - // copy jenkins-slave.xml - String xml = createAndCopyJenkinsSlaveXml(java, id, logger, remoteRoot); - - // install it as a service - logger.println(Messages.ManagedWindowsServiceLauncher_RegisteringService()); - Document dom = new SAXReader().read(new StringReader(xml)); - Win32Service svc = services.Get("Win32_Service").cast(Win32Service.class); - int r; - AccountInfo logOn = getLogOn(); - if (logOn == null) { - r = svc.Create( - id, - dom.selectSingleNode("/service/name").getText()+" at "+path, - path+"\\jenkins-slave.exe", - Win32OwnProcess, 0, "Manual", true); - } else { - r = svc.Create( - id, - dom.selectSingleNode("/service/name").getText()+" at "+path, - path+"\\jenkins-slave.exe", - Win32OwnProcess, - 0, - "Manual", - false, // When using a different user, it isn't possible to interact - logOn.userName, - Secret.toString(logOn.password), - null, null, null); - - } - if(r!=0) { - listener.error("Failed to create a service: "+svc.getErrorMessage(r)); - return; - } - slaveService = services.getService(id); - } else { - createAndCopyJenkinsSlaveXml(java, id, logger, remoteRoot); - copySlaveJar(logger, remoteRoot); - } - - logger.println(Messages.ManagedWindowsServiceLauncher_StartingService()); - slaveService.start(); - - // wait until we see the port.txt, but don't do so forever - logger.println(Messages.ManagedWindowsServiceLauncher_WaitingForService()); - SmbFile portFile = new SmbFile(remoteRoot, "port.txt"); - for( int i=0; !portFile.exists(); i++ ) { - if(i>=30) { - listener.error(Messages.ManagedWindowsServiceLauncher_ServiceDidntRespond()); - return; - } - Thread.sleep(1000); - } - int p = readSmbFile(portFile); - - // connect - logger.println(Messages.ManagedWindowsServiceLauncher_ConnectingToPort(p)); - final Socket s = new Socket(name,p); - - // ready - computer.setChannel(new BufferedInputStream(new SocketInputStream(s)), - new BufferedOutputStream(new SocketOutputStream(s)), - listener.getLogger(),new Listener() { - @Override - public void onClosed(Channel channel, IOException cause) { - afterDisconnect(computer,listener); - } - }); - //destroy session to free the socket - JISession.destroySession(session); - } catch (SmbException e) { - e.printStackTrace(listener.error(e.getMessage())); - } catch (JIException e) { - if(e.getErrorCode()==5) - // access denied error - e.printStackTrace(listener.error(Messages.ManagedWindowsServiceLauncher_AccessDenied())); - else - e.printStackTrace(listener.error(e.getMessage())); - } catch (DocumentException e) { - e.printStackTrace(listener.error(e.getMessage())); - } - } - - private String resolveJava(SlaveComputer computer) { - if (StringUtils.isNotBlank(javaPath)) { - return getEnvVars(computer).expand(javaPath); - } - return "java"; - } - - // -- duplicates code from ssh-slaves-plugin - private EnvVars getEnvVars(SlaveComputer computer) { - final EnvVars global = getEnvVars(Jenkins.getInstance()); - - final EnvVars local = getEnvVars(computer.getNode()); - - if (global != null) { - if (local != null) { - final EnvVars merged = new EnvVars(global); - merged.overrideAll(local); - - return merged; - } else { - return global; - } - } else if (local != null) { - return local; - } else { - return new EnvVars(); - } - } - - private EnvVars getEnvVars(Node n) { - return getEnvVars(n.getNodeProperties()); - } - - private EnvVars getEnvVars(DescribableList, NodePropertyDescriptor> dl) { - final EnvironmentVariablesNodeProperty evnp = dl.get(EnvironmentVariablesNodeProperty.class); - if (evnp == null) { - return null; - } - return evnp.getEnvVars(); - } - - - private void checkPort135Access(PrintStream logger, String name, InetAddress host) throws IOException { - Socket s = new Socket(); - try { - s.connect(new InetSocketAddress(host,135),5000); - } catch (IOException e) { - logger.println("Failed to connect to port 135 of "+name+". Is Windows firewall blocking this port? Or did you disable DCOM service?"); - // again, let it continue. - } finally { - s.close(); - } - } - - /** - * Determines the host name (or the IP address) to connect to. - */ - protected String determineHost(Computer c) { - // If host not provided, default to the slave name - if (StringUtils.isBlank(host)) { - return c.getName(); - } else { - return host; - } - } - - private String createAndCopyJenkinsSlaveXml(String java, String serviceId, PrintStream logger, SmbFile remoteRoot) throws IOException { - logger.println(Messages.ManagedWindowsServiceLauncher_CopyingSlaveXml()); - String xml = generateSlaveXml(serviceId, - java + "w.exe", vmargs, "-tcp %BASE%\\port.txt"); - copyStreamAndClose(new ByteArrayInputStream(xml.getBytes("UTF-8")), new SmbFile(remoteRoot,"jenkins-slave.xml").getOutputStream()); - return xml; - } - - private void copySlaveJar(PrintStream logger, SmbFile remoteRoot) throws IOException { - // copy slave.jar - logger.println(Messages.ManagedWindowsServiceLauncher_CopyingSlaveJar()); - copyStreamAndClose(Jenkins.getInstance().getJnlpJars("slave.jar").getURL().openStream(), new SmbFile(remoteRoot,"slave.jar").getOutputStream()); - } - - private int readSmbFile(SmbFile f) throws IOException { - InputStream in=null; - try { - in = f.getInputStream(); - return Integer.parseInt(IOUtils.toString(in)); - } finally { - IOUtils.closeQuietly(in); - } - } - - @Override - public void afterDisconnect(SlaveComputer computer, TaskListener listener) { - try { - JIDefaultAuthInfoImpl auth = createAuth(); - JISession session = JISession.createSession(auth); - session.setGlobalSocketTimeout(60000); - SWbemServices services = WMI.connect(session, determineHost(computer)); - String id = generateServiceId(computer.getNode().getRemoteFS()); - Win32Service slaveService = services.getService(id); - if(slaveService!=null) { - listener.getLogger().println(Messages.ManagedWindowsServiceLauncher_StoppingService()); - slaveService.StopService(); - listener.getLogger().println(Messages.ManagedWindowsServiceLauncher_UnregisteringService()); - slaveService.Delete(); - } - //destroy session to free the socket - JISession.destroySession(session); - } catch (UnknownHostException e) { - e.printStackTrace(listener.error(e.getMessage())); - } catch (JIException e) { - e.printStackTrace(listener.error(e.getMessage())); - } catch (IOException e) { - e.printStackTrace(listener.error(e.getMessage())); - } - } - - String generateServiceId(String slaveRoot) throws IOException { - return "jenkinsslave-"+slaveRoot.replace(':','_').replace('\\','_').replace('/','_'); - } - - String generateSlaveXml(String id, String java, String vmargs, String args) throws IOException { - String xml = org.apache.commons.io.IOUtils.toString(getClass().getResourceAsStream("/windows-service/jenkins-slave.xml"), "UTF-8"); - xml = xml.replace("@ID@", id); - xml = xml.replace("@JAVA@", java); - xml = xml.replace("@VMARGS@", StringUtils.defaultString(vmargs)); - xml = xml.replace("@ARGS@", args); - return xml; - } - - @Extension - public static class DescriptorImpl extends Descriptor { - public String getDisplayName() { - return Messages.ManagedWindowsServiceLauncher_DisplayName(); - } - } - - private static final Logger JINTEROP_LOGGER = Logger.getLogger("org.jinterop"); - - static { - JINTEROP_LOGGER.setLevel(Level.WARNING); - } -} diff --git a/core/src/main/java/hudson/os/windows/WindowsRemoteFileSystem.java b/core/src/main/java/hudson/os/windows/WindowsRemoteFileSystem.java deleted file mode 100644 index f1b73f3f4a..0000000000 --- a/core/src/main/java/hudson/os/windows/WindowsRemoteFileSystem.java +++ /dev/null @@ -1,60 +0,0 @@ -package hudson.os.windows; - -import hudson.tools.JDKInstaller.FileSystem; -import jcifs.smb.NtlmPasswordAuthentication; -import jcifs.smb.SmbFile; - -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.util.List; - -import static java.util.Arrays.asList; - -/** - * {@link FileSystem} implementation for remote Windows system. - * - * @author Kohsuke Kawaguchi - */ -public class WindowsRemoteFileSystem implements FileSystem { - private final String hostName; - private final NtlmPasswordAuthentication auth; - - public WindowsRemoteFileSystem(String hostName, NtlmPasswordAuthentication auth) { - this.hostName = hostName; - this.auth = auth; - } - - private SmbFile $(String path) throws MalformedURLException { - return new SmbFile("smb://" + hostName + "/" + path.replace('\\', '/').replace(':', '$')+"/",auth); - } - - public void delete(String file) throws IOException, InterruptedException { - $(file).delete(); - } - - public void chmod(String file, int mode) throws IOException, InterruptedException { - // no-op on Windows - } - - public InputStream read(String file) throws IOException { - return $(file).getInputStream(); - } - - public List listSubDirectories(String dir) throws IOException, InterruptedException { - return asList($(dir).list()); - } - - public void pullUp(String from, String to) throws IOException, InterruptedException { - SmbFile src = $(from); - SmbFile dst = $(to); - for (SmbFile e : src.listFiles()) { - e.renameTo(new SmbFile(dst,e.getName())); - } - src.delete(); - } - - public void mkdirs(String path) throws IOException { - $(path).mkdirs(); - } -} diff --git a/core/src/main/java/hudson/os/windows/WindowsRemoteLauncher.java b/core/src/main/java/hudson/os/windows/WindowsRemoteLauncher.java deleted file mode 100644 index c64c3c6c21..0000000000 --- a/core/src/main/java/hudson/os/windows/WindowsRemoteLauncher.java +++ /dev/null @@ -1,126 +0,0 @@ -package hudson.os.windows; - -import hudson.FilePath; -import hudson.Launcher; -import hudson.Proc; -import hudson.Util; -import hudson.model.Computer; -import hudson.model.TaskListener; -import hudson.remoting.Channel; -import hudson.util.StreamCopyThread; -import org.jinterop.dcom.common.JIException; -import org.jvnet.hudson.remcom.WindowsRemoteProcessLauncher; - -import java.io.BufferedOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.Map; - -import static java.util.Arrays.asList; - -/** - * Pseudo-{@link Launcher} implementation that uses {@link WindowsRemoteProcessLauncher} - * - * @author Kohsuke Kawaguchi - */ -public class WindowsRemoteLauncher extends Launcher { - private final WindowsRemoteProcessLauncher launcher; - - public WindowsRemoteLauncher(TaskListener listener, WindowsRemoteProcessLauncher launcher) { - super(listener,null); - this.launcher = launcher; - } - - private String buildCommandLine(ProcStarter ps) { - StringBuilder b = new StringBuilder(); - for (String cmd : ps.cmds()) { - if (b.length()>0) b.append(' '); - if (cmd.indexOf(' ')>=0) - b.append('"').append(cmd).append('"'); - else - b.append(cmd); - } - return b.toString(); - } - - public Proc launch(ProcStarter ps) throws IOException { - maskedPrintCommandLine(ps.cmds(), ps.masks(), ps.pwd()); - - // TODO: environment variable handling - - String name = ps.cmds().toString(); - - final Process proc; - try { - proc = launcher.launch(buildCommandLine(ps), ps.pwd().getRemote()); - } catch (JIException e) { - throw new IOException(e); - } catch (InterruptedException e) { - throw new IOException(e); - } - final Thread t1 = new StreamCopyThread("stdout copier: "+name, proc.getInputStream(), ps.stdout(),false); - t1.start(); - final Thread t2 = new StreamCopyThread("stdin copier: "+name,ps.stdin(), proc.getOutputStream(),true); - t2.start(); - - return new Proc() { - public boolean isAlive() throws IOException, InterruptedException { - try { - proc.exitValue(); - return false; - } catch (IllegalThreadStateException e) { - return true; - } - } - - public void kill() throws IOException, InterruptedException { - t1.interrupt(); - t2.interrupt(); - proc.destroy(); - } - - public int join() throws IOException, InterruptedException { - try { - t1.join(); - t2.join(); - return proc.waitFor(); - } finally { - proc.destroy(); - } - } - - @Override - public InputStream getStdout() { - throw new UnsupportedOperationException(); - } - - @Override - public InputStream getStderr() { - throw new UnsupportedOperationException(); - } - - @Override - public OutputStream getStdin() { - throw new UnsupportedOperationException(); - } - }; - } - - public Channel launchChannel(String[] cmd, OutputStream out, FilePath _workDir, Map envVars) throws IOException, InterruptedException { - printCommandLine(cmd, _workDir); - - try { - Process proc = launcher.launch(Util.join(asList(cmd), " "), _workDir.getRemote()); - - return new Channel("channel over named pipe to "+launcher.getHostName(), - Computer.threadPoolForRemoting, proc.getInputStream(), new BufferedOutputStream(proc.getOutputStream())); - } catch (JIException e) { - throw new IOException(e); - } - } - - public void kill(Map modelEnvVars) throws IOException, InterruptedException { - // no way to do this - } -} diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceAccount/AnotherUser/config.groovy b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceAccount/AnotherUser/config.groovy deleted file mode 100644 index 8d00e31184..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceAccount/AnotherUser/config.groovy +++ /dev/null @@ -1,9 +0,0 @@ -package hudson.os.windows.ManagedWindowsServiceAccount.AnotherUser; - -def f = namespace(lib.FormTagLib) -f.entry (title:_("User name"),field:"userName") { - f.textbox() -} -f.entry (title:_("Password"),field:"password") { - f.password() -} \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceAccount/AnotherUser/config_zh_TW.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceAccount/AnotherUser/config_zh_TW.properties deleted file mode 100644 index 5c408dcb49..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceAccount/AnotherUser/config_zh_TW.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -User\ name=\u4f7f\u7528\u8005\u540d\u7a31 -Password=\u5bc6\u78bc diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceAccount/config.groovy b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceAccount/config.groovy deleted file mode 100644 index 5d712a8770..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceAccount/config.groovy +++ /dev/null @@ -1 +0,0 @@ -package hudson.os.windows.ManagedWindowsServiceAccount; \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config.jelly b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config.jelly deleted file mode 100644 index 98bbfe975a..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config.jelly +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config_es.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config_es.properties deleted file mode 100644 index c318297518..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config_es.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Password=Contrasea -Administrator\ user\ name=Nombre del usuario administrador diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config_ja.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config_ja.properties deleted file mode 100644 index 590d7dd106..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config_ja.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright 2012 Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Administrator\ user\ name=\u7ba1\u7406\u8005\u306e\u30e6\u30fc\u30b6\u30fc\u540d -Password=\u30d1\u30b9\u30ef\u30fc\u30c9 diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config_zh_TW.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config_zh_TW.properties deleted file mode 100644 index fc2c140387..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config_zh_TW.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Administrator\ user\ name=\u7cfb\u7d71\u7ba1\u7406\u54e1\u4f7f\u7528\u8005\u540d\u7a31 -Password=\u5bc6\u78bc diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/AccountInfo/config.groovy b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/AccountInfo/config.groovy deleted file mode 100644 index 5a799e2917..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/AccountInfo/config.groovy +++ /dev/null @@ -1,12 +0,0 @@ -package hudson.os.windows.ManagedWindowsServiceLauncher.AccountInfo; - - -def f=namespace(lib.FormTagLib) - -f.entry (title:_("User name"),field:"userName") { - f.textbox() -} - -f.entry (title:_("Password"),field:"password") { - f.password() -} diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/AccountInfo/config_ja.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/AccountInfo/config_ja.properties deleted file mode 100644 index 0a647058bd..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/AccountInfo/config_ja.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2012, Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -User\ name=\u30e6\u30fc\u30b6\u540d -Password=\u30d1\u30b9\u30ef\u30fc\u30c9 diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/AccountInfo/config_zh_TW.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/AccountInfo/config_zh_TW.properties deleted file mode 100644 index 5c408dcb49..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/AccountInfo/config_zh_TW.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -User\ name=\u4f7f\u7528\u8005\u540d\u7a31 -Password=\u5bc6\u78bc diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config.jelly b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config.jelly deleted file mode 100644 index 4c58ab2e4b..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config.jelly +++ /dev/null @@ -1,46 +0,0 @@ - - - - - ${%blurb} - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config.properties deleted file mode 100644 index e438444991..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config.properties +++ /dev/null @@ -1,3 +0,0 @@ -blurb=\ - This launch method relies on DCOM and is often associated with subtle problems. \ - Consider using Launch slave agents using Java Web Start instead, which also permits installation as a Windows service but is generally considered more reliable. diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_da.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_da.properties deleted file mode 100644 index 40100494a9..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_da.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Password=Adgangskode -Administrator\ user\ name=Administrator brugernavn diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_de.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_de.properties deleted file mode 100644 index 0d584da9dd..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_de.properties +++ /dev/null @@ -1,6 +0,0 @@ -Administrator\ user\ name=Administrativer Benutzer -Host=Host -JVM\ options=JVM-Optionen -Password=Passwort -Path\ to\ java\ executable=Pfad zum Java-Executable -Run\ service\ as=Dienst ausf\u00FChren als diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_es.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_es.properties deleted file mode 100644 index 50f86e7c78..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_es.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Administrator\ user\ name=Usuario administrador -Password=Contrasea -Host=Servidor -JVM\ options=Opciones de la JVM -Run\ service\ as=Ejecutar el servicio como diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_fr.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_fr.properties deleted file mode 100644 index 04a68a7879..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_fr.properties +++ /dev/null @@ -1,29 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Eric Lefevre-Ardant -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Administrator\ user\ name=Nom de l''utilisateur administrateur -Password=Mot de passe -JVM\ options=Options de la JVM -Log\ on\ using\ a\ different\ account=Se connecter en utilisant un utilisateur diffrent -Run\ service\ as=D\u00E9marrer le service en tant que -User\ name=Nom d''utilisateur -Host=Hte diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_ja.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_ja.properties deleted file mode 100644 index 0bdbc1ebd9..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_ja.properties +++ /dev/null @@ -1,32 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2013, Sun Microsystems, Inc., Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Administrator\ user\ name=\u7ba1\u7406\u8005\u306e\u30e6\u30fc\u30b6\u30fc\u540d -Password=\u30d1\u30b9\u30ef\u30fc\u30c9 -Host=\u30db\u30b9\u30c8 -Run\ service\ as=\u30b5\u30fc\u30d3\u30b9\u3092\u5b9f\u884c\u3059\u308b\u30e6\u30fc\u30b6\u30fc -JVM\ options=JVM\u30aa\u30d7\u30b7\u30e7\u30f3 -Path\ to\ java\ executable=Java\u306e\u30d1\u30b9 -blurb=\ - \u3053\u306e\u8d77\u52d5\u65b9\u6cd5\u306fDCOM\u306b\u4f9d\u5b58\u3057\u3066\u3044\u3066\u3001\u3057\u3070\u3057\u3070\u5fae\u5999\u306a\u554f\u984c\u306b\u906d\u9047\u3059\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002\ - \u304b\u308f\u308a\u306b\u3001Java Web Start\u3092\u5229\u7528\u3057\u305f\u30b9\u30ec\u30fc\u30d6\u306e\u8d77\u52d5\u3092\u4f7f\u7528\u3059\u308b\u3053\u3068\u3082\u8003\u616e\u3057\u3066\u304f\u3060\u3055\u3044\u3002Windows\u306e\u30b5\u30fc\u30d3\u30b9\u3068\u3057\u3066\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3057\u3001\u4e00\u822c\u7684\u306b\u3088\u308a\u4fe1\u983c\u6027\u304c\u9ad8\u3044\u3067\u3059\u3002 - diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_lv.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_lv.properties deleted file mode 100644 index 470d235356..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_lv.properties +++ /dev/null @@ -1,5 +0,0 @@ -# This file is under the MIT License by authors - -JVM\ options=JVM opcijas -Path\ to\ java\ executable=Ce\u013C\u0161 uz java izpild\u0101mo failu -Run\ service\ as=Palaist servisu k\u0101 diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_nl.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_nl.properties deleted file mode 100644 index 0b495aed95..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_nl.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Administrator\ user\ name=Gebruikersnaam beheerder -Password=Wachtwoord diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_pt_BR.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_pt_BR.properties deleted file mode 100644 index 6c0934a224..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_pt_BR.properties +++ /dev/null @@ -1,29 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Host=host -JVM\ options=Op\u00E7\u00F5es de JVM -Password=Senha -Administrator\ user\ name=Nome do usu\u00e1rio administrador -Path\ to\ java\ executable=Caminho para o execut\u00E1vel do Java -Run\ service\ as=Executar servi\u00E7o como -blurb=Este m\u00E9todo de inicializa\u00E7\u00E3o confia no DCOM e \u00E9 comumente associado com problemas sutis. Ao inv\u00E9s disso, considere utilizar Inicialize Slave Agents utilizando Java Web Start, o que tamb\u00E9m permite a instala\u00E7\u00E3o como um servi\u00E7o Windows mas tamb\u00E9m considerando mais confi\u00E1vel. diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_sv_SE.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_sv_SE.properties deleted file mode 100644 index 94cad0f9d3..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_sv_SE.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Administrator\ user\ name=Administrat\u00F6rens anv\u00E4ndarnamn -Password=L\u00F6senord diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_zh_TW.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_zh_TW.properties deleted file mode 100644 index 6fe16a854a..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_zh_TW.properties +++ /dev/null @@ -1,31 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -blurb=\ - \u9019\u500b\u555f\u52d5\u65b9\u5f0f\u662f\u9760 DCOM\uff0c\u800c\u4e14\u5f88\u5bb9\u6613\u6709\u4e9b\u83ab\u540d\u5176\u5999\u7684\u554f\u984c\u3002 \ - \u8981\u4e0d\u8981\u8003\u616e\u6539\u7528\u900f\u904e Java Web Start \u555f\u52d5 Slave \u4ee3\u7406\u7a0b\u5f0f\uff0c\u9019\u7a2e\u65b9\u5f0f\u4e5f\u80fd\u5b89\u88dd\u6210 Windows \u670d\u52d9\uff0c\u800c\u4e14\u5927\u5bb6\u666e\u904d\u8a8d\u70ba\u66f4\u7a69\u5b9a\u3002 -Administrator\ user\ name=\u7cfb\u7d71\u7ba1\u7406\u54e1\u4f7f\u7528\u8005\u540d\u7a31 -Password=\u5bc6\u78bc -Host=\u4e3b\u6a5f -Run\ service\ as=\u670D\u52D9\u57F7\u884C\u8EAB\u5206 -Path\ to\ java\ executable=Java \u57f7\u884c\u6a94\u8def\u5f91 -JVM\ options=JVM \u53C3\u6578 diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-host.html b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-host.html deleted file mode 100644 index 79696b380e..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-host.html +++ /dev/null @@ -1,3 +0,0 @@ -
          - Provide the host name of the Windows host if different to the name of the Slave. -
          \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-host_fr.html b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-host_fr.html deleted file mode 100644 index 296d83f844..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-host_fr.html +++ /dev/null @@ -1,3 +0,0 @@ -
          - Fournissez le nom de la machine Windows s'il est différent du nom de l'esclave. -
          \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-host_zh_TW.html b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-host_zh_TW.html deleted file mode 100644 index ca3bc528d6..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-host_zh_TW.html +++ /dev/null @@ -1,3 +0,0 @@ -
          - 預設使用 Slave 的名稱，如果該 Windows 的主機名稱與 Slave 名稱不一樣，請提供主機名稱。 -
          \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-javaPath.html b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-javaPath.html deleted file mode 100644 index f649475901..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-javaPath.html +++ /dev/null @@ -1,4 +0,0 @@ -
          - Path to the Java executable to be used on this node. Defaults to "java", assuming JRE is installed and - available on system PATH (i.e. C:\Windows\system32\java.exe in most cases) -
          \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-javaPath_zh_TW.html b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-javaPath_zh_TW.html deleted file mode 100644 index dc1c9b34b3..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-javaPath_zh_TW.html +++ /dev/null @@ -1,4 +0,0 @@ -
          - 節點要用的 Java 執行檔路徑。預設值是 "java"，因為我們假設已經安裝了 JRE，而且可以透過系統 PATH 執行。 - (大部分是在 C:\Windows\system32\java.exe) -
          \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-logOn.html b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-logOn.html deleted file mode 100644 index 12b0a58b8d..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-logOn.html +++ /dev/null @@ -1,10 +0,0 @@ -
          - Sometimes the administrator account that can install a service remotely - might not be the user account you want to run your Jenkins slave - (one reason you might want to do this is to run your builds/tests in more restricted account - because you don't trust them. Another reason you might want to do this is to run - slaves in some domain user account.) - - This option lets you do this. If left unchecked, this Jenkins slave will - run as the 'SYSTEM' user, who has full access to the local system. -
          \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-logOn_zh_TW.html b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-logOn_zh_TW.html deleted file mode 100644 index 09f7b0110e..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-logOn_zh_TW.html +++ /dev/null @@ -1,8 +0,0 @@ -
          - 有時候遠端安裝服務用的系統管理員帳號不見得就是執行 Jenknis Slave 的帳號 - (理由可能是: 您想用受限制的帳號執行建置、測試，因為您不能信賴那些專案; - 也有可能是您想要使用某些網域使用者帳號。) - - 這個選項讓您可以指定帳號。 - 如果不選的話，Jenkins Slave 會以 'SYSTEM' 系統使用者身分執行，這個帳號有本地系統的完整存取權限。 -
          \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName.html b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName.html deleted file mode 100644 index 210d8b637f..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName.html +++ /dev/null @@ -1,8 +0,0 @@ -
          - Provide the name of the Windows user who has the administrative access - on this computer, such as 'Administrator'. - This information is necessary to start a process remotely. - -

          - To specify a domain user, enter values like 'DOMAIN\Administrator'. -

          \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_de.html b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_de.html deleted file mode 100644 index 84697936d8..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_de.html +++ /dev/null @@ -1,8 +0,0 @@ -
          - Geben Sie den Namen eines Windows-Benutzers an, der administrativen - Zugriff auf diesen Rechner hat, z.B. 'Administrator'. - Diese Information wird benötigt, um einen Prozeß entfernt starten zu können. -

          - Um einen Domain-Benutzer zu verwenden, geben Sie den Wert in der Form - 'DOMAIN\Administrator' an. -

          \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_fr.html b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_fr.html deleted file mode 100644 index da004a117a..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_fr.html +++ /dev/null @@ -1,8 +0,0 @@ -
          - Fournissez le nom d'un utilisateur Windows qui a des droits d'accès en administration sur cet ordinateur, - par exemple 'Administrator'. - Cette information est nécessaire pour démarrer un processus à distance. - -

          - Quand vous donnez le nom d'un utilisateur sur le domaine, entrez des valeurs du type 'DOMAIN\Administrator'. -

          \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_ja.html b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_ja.html deleted file mode 100644 index 4cdfcb8453..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_ja.html +++ /dev/null @@ -1,7 +0,0 @@ -
          - 'Administrator'のようなこのコンピュータの管理者権限を持つユーザー名を指定します。 - この情報は、リモートからプロセスを開始するのに必要です。 - -

          - ドメインユーザーを指定するには、'DOMAIN\Administrator'のような値を入力してください。 -

          \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_zh_TW.html b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_zh_TW.html deleted file mode 100644 index 2fd8c4416a..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help-userName_zh_TW.html +++ /dev/null @@ -1,7 +0,0 @@ -
          - 提供有系統管理員權限的 Windows 使用者帳號，例如 "Administrator"。 - 要填才能遠端啟動處理序。 - -

          - 可以用 "DOMAIN\Administrator" 這種方式指定網域使用者。 -

          \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help.jelly b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help.jelly deleted file mode 100644 index f326f7fa28..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help.jelly +++ /dev/null @@ -1,28 +0,0 @@ - - - - - ${%blurb} - \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help.properties deleted file mode 100644 index 740e93d4cd..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help.properties +++ /dev/null @@ -1,3 +0,0 @@ -blurb=Starts a Windows slave by a remote management facility built into Windows. \ - Suitable for managing Windows slaves. \ - Slaves need to be IP reachable from the master. \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_da.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_da.properties deleted file mode 100644 index c6d503cb93..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_da.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -blurb=\ diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_de.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_de.properties deleted file mode 100644 index a9fcffa97c..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_de.properties +++ /dev/null @@ -1,4 +0,0 @@ -blurb=\ - Startet einen Windows-Slave ber einen \ - Fernwartungsmechanismus, der in Windows integriert ist. Geeignet fr Windows-Slaves. \ - Slaves mssen per IP vom Master-Knoten aus erreichbar sein. diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_es.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_es.properties deleted file mode 100644 index df8b0692c4..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_es.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -blurb=Arranca un nodo secundario windows usando la gestin remota nativa de Windows. \ - La direcctin IP de los nodos secundarios tiene que ser visible desde el nodo principal. - diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_fr.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_fr.properties deleted file mode 100644 index 6800d4d9dd..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_fr.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe, Eric Lefevre-Ardant -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -blurb=Lance un esclave Windows en utilisant un systme de gestion distance intgr Windows. \ - Cela convient uniquement pour grer des esclaves sous Windows. \ - Les esclaves doivent tre accessibles par IP par le matre. diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_ja.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_ja.properties deleted file mode 100644 index 4917e4d463..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_ja.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -blurb=Windows\u306B\u6A19\u6E96\u3067\u5B9F\u88C5\u3055\u308C\u3066\u3044\u308B\u9060\u9694\u7BA1\u7406\u6A5F\u80FD\u3067Windows\u30B9\u30EC\u30FC\u30D6\u3092\u8D77\u52D5\u3057\u307E\u3059\u3002\ - Windows\u30B9\u30EC\u30FC\u30D6\u306E\u7BA1\u7406\u5411\u3051\u3067\u3059\u3002\ - \u30B9\u30EC\u30FC\u30D6\u306F\u30DE\u30B9\u30BF\u304B\u3089IP\u30EA\u30FC\u30C1\u30E3\u30D6\u30EB\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 \ No newline at end of file diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_pt_BR.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_pt_BR.properties deleted file mode 100644 index c24c4b30d2..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_pt_BR.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -# Starts a Windows slave by a remote management facility built into Windows. \ -# Suitable for managing Windows slaves. \ -# Slaves need to be IP reachable from the master. -blurb=Iniciar um Windows slave uma ferramenta de gerenciamento remota - slave precisam ter um IP alcan\u00e7\u00e1vel pelo master \ - diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_zh_TW.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_zh_TW.properties deleted file mode 100644 index 70a9291fbd..0000000000 --- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_zh_TW.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -blurb=\u900f\u904e Windows \u5167\u5efa\u7684\u9060\u7aef\u7ba1\u7406\u6a5f\u5236\u555f\u52d5\u3002\ - \u9069\u5408\u7528\u4f86\u7ba1\u7406 Windows Slave\u3002\ - Master \u8981\u80fd\u9023\u5230 Slave \u7684 IP\u3002 diff --git a/core/src/main/resources/hudson/os/windows/Messages.properties b/core/src/main/resources/hudson/os/windows/Messages.properties deleted file mode 100644 index 11b98bf18b..0000000000 --- a/core/src/main/resources/hudson/os/windows/Messages.properties +++ /dev/null @@ -1,38 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -ManagedWindowsServiceLauncher.DisplayName=\ - Let Jenkins control this Windows slave as a Windows service -ManagedWindowsServiceLauncher.DotNetRequired=.NET Framework 2.0 or later is required on this computer to run a Jenkins slave as a Windows service -ManagedWindowsServiceLauncher.InstallingSlaveService=Installing the Jenkins slave service -ManagedWindowsServiceLauncher.ConnectingTo=Connecting to {0} -ManagedWindowsServiceLauncher.ConnectingToPort=Connecting to port {0} -ManagedWindowsServiceLauncher.CopyingSlaveExe=Copying jenkins-slave.exe -ManagedWindowsServiceLauncher.CopyingSlaveXml=Copying jenkins-slave.xml -ManagedWindowsServiceLauncher.CopyingSlaveJar=Copying slave.jar -ManagedWindowsServiceLauncher.RegisteringService=Registering the service -ManagedWindowsServiceLauncher.UnregisteringService=Unregistering the service -ManagedWindowsServiceLauncher.ServiceDidntRespond=The service did not respond. Perhaps it failed to launch? -ManagedWindowsServiceLauncher.StartingService=Starting the service -ManagedWindowsServiceLauncher.StoppingService=Stopping the service -ManagedWindowsServiceLauncher.WaitingForService=Waiting for the service to become ready -ManagedWindowsServiceLauncher.AccessDenied=Access is denied. See http://wiki.jenkins-ci.org/display/JENKINS/Windows+slaves+fail+to+start+via+DCOM for more information about how to resolve this. diff --git a/core/src/main/resources/hudson/os/windows/Messages_da.properties b/core/src/main/resources/hudson/os/windows/Messages_da.properties deleted file mode 100644 index 5ab594443b..0000000000 --- a/core/src/main/resources/hudson/os/windows/Messages_da.properties +++ /dev/null @@ -1,36 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -ManagedWindowsServiceLauncher.StoppingService=Stopper servicen -ManagedWindowsServiceLauncher.ServiceDidntRespond=Servicen svarede ikke. M\u00e5ske startede den ikke? -ManagedWindowsServiceLauncher.CopyingSlaveXml=Kopierer jenkins-slave.xml -ManagedWindowsServiceLauncher.ConnectingToPort=Forbinder til port {0} -ManagedWindowsServiceLauncher.DotNetRequired=.NET Framework 2.0 eller nyere er n\u00f8dvendig p\u00e5 denne computer for at kunne k\u00f8re Jenkins som en Windows service -ManagedWindowsServiceLauncher.ConnectingTo=Forbinder til {0} -ManagedWindowsServiceLauncher.RegisteringService=Registrerer servicen -ManagedWindowsServiceLauncher.StartingService=Starter servicen -ManagedWindowsServiceLauncher.WaitingForService=Venter p\u00e5 at servicen bliver klar -ManagedWindowsServiceLauncher.AccessDenied=\ -Adgang er n\u00e6gtet. Se http://wiki.jenkins-ci.org/display/JENKINS/Windows+slaves+fail+to+start+via+DCOM for information om hvordan du kan l\u00f8se dette problem. -ManagedWindowsServiceLauncher.CopyingSlaveExe=Kopierer jenkins-slave.exe -ManagedWindowsServiceLauncher.InstallingSlaveService=Installerer Jenkins slave servicen -ManagedWindowsServiceLauncher.DisplayName=Lad Jenkins styre denne Windows slave som en Windows service diff --git a/core/src/main/resources/hudson/os/windows/Messages_de.properties b/core/src/main/resources/hudson/os/windows/Messages_de.properties deleted file mode 100644 index c9c50971c1..0000000000 --- a/core/src/main/resources/hudson/os/windows/Messages_de.properties +++ /dev/null @@ -1,39 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -ManagedWindowsServiceLauncher.DisplayName=\ - Jenkins soll auf diesem Windows-Slave als Windows-Dienst betrieben werden -ManagedWindowsServiceLauncher.DotNetRequired=\ - Das .NET Framework 2.0 (oder neuer) wird auf diesem Rechner bentigt, \ - um den Jenkins-Slave als Windows-Dienst zu betreiben. -ManagedWindowsServiceLauncher.InstallingSlaveService=Installiere den Jenkins-Slave-Dienst -ManagedWindowsServiceLauncher.ConnectingTo=Verbinde zu {0} -ManagedWindowsServiceLauncher.ConnectingToPort=Verbinde ber Port {0} -ManagedWindowsServiceLauncher.CopyingSlaveExe=Kopiere jenkins-slave.exe -ManagedWindowsServiceLauncher.CopyingSlaveXml=Kopiere jenkins-slave.xml -ManagedWindowsServiceLauncher.RegisteringService=Registriere Dienst -ManagedWindowsServiceLauncher.ServiceDidntRespond=Der Dienst antwortete nicht. Ist der Startvorgang vielleicht fehlgeschlagen? -ManagedWindowsServiceLauncher.StartingService=Starte den Dienst -ManagedWindowsServiceLauncher.StoppingService=Stoppe den Dienst -ManagedWindowsServiceLauncher.WaitingForService=Warte auf Verfgbarkeit des Dienstes -ManagedWindowsServiceLauncher.AccessDenied=\ - Zugriff verweigert. Hinweise zur Problemlsung finden Sie unter http://wiki.jenkins-ci.org/display/JENKINS/Windows+slaves+fail+to+start+via+DCOM. diff --git a/core/src/main/resources/hudson/os/windows/Messages_es.properties b/core/src/main/resources/hudson/os/windows/Messages_es.properties deleted file mode 100644 index 10e9d02c03..0000000000 --- a/core/src/main/resources/hudson/os/windows/Messages_es.properties +++ /dev/null @@ -1,38 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -ManagedWindowsServiceLauncher.DisplayName=\ - Permitir que Jenkins-esclavo se arranque como un servicio windows -ManagedWindowsServiceLauncher.DotNetRequired=Se necesita tener instalado ''.NET Framework 2.0'' o posterior para poder ejecutar Jenkins-esclavo como un servicio de Windows -ManagedWindowsServiceLauncher.InstallingSlaveService=Instalando el servicio Jenkins-esclavo -ManagedWindowsServiceLauncher.ConnectingTo=Conectando con {0} -ManagedWindowsServiceLauncher.ConnectingToPort=Conectando al puerto {0} -ManagedWindowsServiceLauncher.CopyingSlaveExe=Copiando jenkins-slave.exe -ManagedWindowsServiceLauncher.CopyingSlaveXml=Copiando jenkins-slave.xml -ManagedWindowsServiceLauncher.RegisteringService=Registrando el servicio -ManagedWindowsServiceLauncher.ServiceDidntRespond=El servicio no responde. Es posible que el inicio del servicio fallara. -ManagedWindowsServiceLauncher.StartingService=Iniciando el servicio -ManagedWindowsServiceLauncher.StoppingService=Parando el servicio -ManagedWindowsServiceLauncher.WaitingForService=Esperando que el servicio est listo. -ManagedWindowsServiceLauncher.AccessDenied=Acceso denegado. Echa un vistazo a http://wiki.jenkins-ci.org/display/JENKINS/Windows+slaves+fail+to+start+via+DCOM para mas informacin -ManagedWindowsServiceLauncher.CopyingSlaveJar=Copiando slave.jar -ManagedWindowsServiceLauncher.UnregisteringService=Eliminando el servicio diff --git a/core/src/main/resources/hudson/os/windows/Messages_fr.properties b/core/src/main/resources/hudson/os/windows/Messages_fr.properties deleted file mode 100644 index c5ab2be560..0000000000 --- a/core/src/main/resources/hudson/os/windows/Messages_fr.properties +++ /dev/null @@ -1,35 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe, Eric Lefevre-Ardant -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -ManagedWindowsServiceLauncher.DisplayName=\ - Permet \u00e0 Jenkins de contr\u00f4ler cet esclave Windows en tant que service Windows -ManagedWindowsServiceLauncher.DotNetRequired=Le Framework .NET version 2.0 ou plus est n\u00e9cessaire sur cet ordinateur pour lancer un esclave Jenkins en tant que service Windows -ManagedWindowsServiceLauncher.InstallingSlaveService=Installation du service esclave Windows -ManagedWindowsServiceLauncher.ConnectingTo=Connexion \u00e0 {0} -ManagedWindowsServiceLauncher.ConnectingToPort=Connexion au port {0} -ManagedWindowsServiceLauncher.CopyingSlaveExe=Copie de jenkins-slave.exe -ManagedWindowsServiceLauncher.CopyingSlaveXml=Copie de jenkins-slave.xml -ManagedWindowsServiceLauncher.RegisteringService=Enregistrement du service -ManagedWindowsServiceLauncher.ServiceDidntRespond=Le service n''a pas r\u00e9pondu. Peut-\u00eatre n''a-t-il pas pu se lancer? -ManagedWindowsServiceLauncher.StartingService=D\u00e9marrage du service -ManagedWindowsServiceLauncher.StoppingService=Arr\u00eat du service -ManagedWindowsServiceLauncher.WaitingForService=Attente que le service soit disponible diff --git a/core/src/main/resources/hudson/os/windows/Messages_ja.properties b/core/src/main/resources/hudson/os/windows/Messages_ja.properties deleted file mode 100644 index 5a1f872647..0000000000 --- a/core/src/main/resources/hudson/os/windows/Messages_ja.properties +++ /dev/null @@ -1,37 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2012, Sun Microsystems, Inc., Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -ManagedWindowsServiceLauncher.DisplayName= Windows\u30b5\u30fc\u30d3\u30b9\u3068\u3057\u3066\u3053\u306eWindows\u30b9\u30ec\u30fc\u30d6\u3092\u5236\u5fa1 -ManagedWindowsServiceLauncher.DotNetRequired= Jenkins\u306e\u30b9\u30ec\u30fc\u30d6\u3092Windows\u306e\u30b5\u30fc\u30d3\u30b9\u3068\u3057\u3066\u5b9f\u884c\u3059\u308b\u306b\u306f\u3001.NET Framework 2.0\u4ee5\u964d\u304c\u5fc5\u8981\u3067\u3059\u3002 -ManagedWindowsServiceLauncher.InstallingSlaveService= Jenkins\u306e\u30b9\u30ec\u30fc\u30d6\u3092\u30b5\u30fc\u30d3\u30b9\u3068\u3057\u3066\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3059\u3002 -ManagedWindowsServiceLauncher.ConnectingTo= {0} \u306b\u63a5\u7d9a\u3057\u307e\u3059\u3002 -ManagedWindowsServiceLauncher.ConnectingToPort= \u30dd\u30fc\u30c8 {0} \u306b\u63a5\u7d9a\u3057\u307e\u3059\u3002 -ManagedWindowsServiceLauncher.CopyingSlaveExe= jenkins-slave.exe\u3092\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002 -ManagedWindowsServiceLauncher.CopyingSlaveXml= jenkins-slave.xml\u3092\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002 -ManagedWindowsServiceLauncher.CopyingSlaveJar=slave.jar\u3092\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002 -ManagedWindowsServiceLauncher.RegisteringService= \u30b5\u30fc\u30d3\u30b9\u3092\u518d\u8d77\u52d5\u3057\u307e\u3059\u3002 -ManagedWindowsServiceLauncher.UnregisteringService=\u30b5\u30fc\u30d3\u30b9\u3092\u524a\u9664\u3057\u307e\u3059\u3002 -ManagedWindowsServiceLauncher.ServiceDidntRespond= \u30b5\u30fc\u30d3\u30b9\u304c\u53cd\u5fdc\u3057\u307e\u305b\u3093\u3002\u305f\u3076\u3093\u3001\u8d77\u52d5\u306b\u5931\u6557\u3057\u3066\u3044\u308b\u3088\u3046\u3067\u3059\u3002 -ManagedWindowsServiceLauncher.StartingService= \u30b5\u30fc\u30d3\u30b9\u3092\u958b\u59cb\u3057\u307e\u3059\u3002 -ManagedWindowsServiceLauncher.StoppingService= \u30b5\u30fc\u30d3\u30b9\u3092\u4e2d\u6b62\u3057\u307e\u3059\u3002 -ManagedWindowsServiceLauncher.WaitingForService= \u30b5\u30fc\u30d3\u30b9\u304c\u6e96\u5099\u3067\u304d\u308b\u307e\u3067\u5f85\u6a5f\u4e2d\u3067\u3059\u3002 -ManagedWindowsServiceLauncher.AccessDenied=\ - \u30a2\u30af\u30bb\u30b9\u306f\u62d2\u5426\u3055\u308c\u307e\u3057\u305f\u3002\u89e3\u6c7a\u65b9\u6cd5\u306e\u8a73\u7d30\u306b\u3064\u3044\u3066\u306f\u3001http://wiki.jenkins-ci.org/display/JENKINS/Windows+slaves+fail+to+start+via+DCOM \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002 diff --git a/core/src/main/resources/hudson/os/windows/Messages_pt_BR.properties b/core/src/main/resources/hudson/os/windows/Messages_pt_BR.properties deleted file mode 100644 index d05d3059b9..0000000000 --- a/core/src/main/resources/hudson/os/windows/Messages_pt_BR.properties +++ /dev/null @@ -1,49 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -# Stopping the service -ManagedWindowsServiceLauncher.StoppingService=Parando o servi\u00e7o -# Copying jenkins-slave.exe -ManagedWindowsServiceLauncher.CopyingSlaveExe=Copiando jenkins-slave.exe -# Installing the Jenkins slave service -ManagedWindowsServiceLauncher.InstallingSlaveService=Instalando o servi\u00e7o slave -# The service didn''t respond. Perphaps it failed to launch? -ManagedWindowsServiceLauncher.ServiceDidntRespond=O servi\u00e7o n\u00e3o responde. Talvez falhou no lan\u00e7amento. -# \ -# Let Jenkins control this Windows slave as a Windows service -ManagedWindowsServiceLauncher.DisplayName=Deixar o Jenkins controlar essa janela slave como um servi\u00e7o do Windows -# .NET Framework 2.0 or later is required on this computer to run a Jenkins slave as a Windows service -ManagedWindowsServiceLauncher.DotNetRequired=Necess\u00e1rio Framework .NET 2.0 instalado para rodar o slave Jenkins como um servi\u00e7o do windows -# Connecting to {0} -ManagedWindowsServiceLauncher.ConnectingTo=Conectando a {0} -# Registering the service -ManagedWindowsServiceLauncher.RegisteringService=Registrando o servi\u00e7o -# Copying jenkins-slave.xml -ManagedWindowsServiceLauncher.CopyingSlaveXml=Copiando jenkins-slave.xml -# Connecting to port {0} -ManagedWindowsServiceLauncher.ConnectingToPort=Conectando a porta {0} -# Starting the service -ManagedWindowsServiceLauncher.StartingService=Iniciando o servi\u00e7o -# Waiting for the service to become ready -ManagedWindowsServiceLauncher.WaitingForService=Esperando o servi\u00e7o ficar pronto -# Access is denied. See http://wiki.jenkins-ci.org/display/JENKINS/Windows+slaves+fail+to+start+via+DCOM for more information about how to resolve this. -ManagedWindowsServiceLauncher.AccessDenied=Acesso negado. Veja http://wiki.jenkins-ci.org/display/JENKINS/Windows+slaves+fail+to+start+via+DCOM diff --git a/core/src/main/resources/hudson/os/windows/Messages_zh_TW.properties b/core/src/main/resources/hudson/os/windows/Messages_zh_TW.properties deleted file mode 100644 index 6e5005c18e..0000000000 --- a/core/src/main/resources/hudson/os/windows/Messages_zh_TW.properties +++ /dev/null @@ -1,38 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -ManagedWindowsServiceLauncher.DisplayName=\ - \u8b93 Jenkins \u4ee5 Windows \u670d\u52d9\u63a7\u5236\u9019\u500b Slave -ManagedWindowsServiceLauncher.DotNetRequired=\u9019\u90e8\u96fb\u8166\u8981\u6709 .NET Framework 2.0 \u6216\u662f\u66f4\u65b0\u7684\u7248\u672c\u624d\u80fd\u5c07 Jenkins Slave \u5b89\u88dd\u70ba Windows \u670d\u52d9 -ManagedWindowsServiceLauncher.InstallingSlaveService=\u5b89\u88dd Jenkins Slave \u670d\u52d9 -ManagedWindowsServiceLauncher.ConnectingTo=\u9023\u7dda\u5230 {0} -ManagedWindowsServiceLauncher.ConnectingToPort=\u9023\u7dda\u5230\u9023\u63a5\u57e0 {0} -ManagedWindowsServiceLauncher.CopyingSlaveExe=\u8907\u88fd jenkins-slave.exe -ManagedWindowsServiceLauncher.CopyingSlaveXml=\u8907\u88fd jenkins-slave.xml -ManagedWindowsServiceLauncher.CopyingSlaveJar=\u8907\u88fd slave.jar -ManagedWindowsServiceLauncher.RegisteringService=\u8a3b\u518a\u670d\u52d9 -ManagedWindowsServiceLauncher.UnregisteringService=\u79fb\u9664\u8a3b\u518a\u670d\u52d9 -ManagedWindowsServiceLauncher.ServiceDidntRespond=\u670d\u52d9\u6c92\u6709\u56de\u61c9\u3002\u53ef\u80fd\u662f\u555f\u52d5\u5931\u6557? -ManagedWindowsServiceLauncher.StartingService=\u555f\u52d5\u670d\u52d9 -ManagedWindowsServiceLauncher.StoppingService=\u505c\u6b62\u670d\u52d9 -ManagedWindowsServiceLauncher.WaitingForService=\u7b49\u5019\u670d\u52d9\u5c31\u7dd2 -ManagedWindowsServiceLauncher.AccessDenied=\u5b58\u53d6\u88ab\u62d2\u3002\u8acb\u53c3\u8003 http://wiki.jenkins-ci.org/display/JENKINS/Windows+slaves+fail+to+start+via+DCOM \u4e86\u89e3\u5982\u4f55\u8655\u7406\u3002 diff --git a/licenseCompleter.groovy b/licenseCompleter.groovy index d1eb4f8995..8b8f493a00 100644 --- a/licenseCompleter.groovy +++ b/licenseCompleter.groovy @@ -68,7 +68,7 @@ complete { // these are our own modules that have license in the trunk but not in these released versions // as we upgrade them, we should just pick up the license info from POM - match(["*:jinterop-wmi","*:maven2.1-interceptor","*:lib-jenkins-maven-embedder"]) { + match(["*:maven2.1-interceptor","*:lib-jenkins-maven-embedder"]) { rewriteLicense([],jenkinsLicense) } diff --git a/war/pom.xml b/war/pom.xml index f2b9f89ab4..f573057cd1 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -344,6 +344,12 @@ THE SOFTWARE. 1.1 hpi + + org.jenkins-ci.plugins + windows-slaves + 1.0 + hpi + ${project.build.directory}/${project.build.finalName}/WEB-INF/plugins true -- GitLab From a1a7f282ff9d3e08ad7ba3c322bbeccfdf0dc7f4 Mon Sep 17 00:00:00 2001 From: Fernando Boaglio Date: Sun, 5 Jan 2014 00:08:08 -0200 Subject: [PATCH 0645/1630] pt_BR translation (diagnosis + matrix + logging) --- .../thirdPartyLicenses_pt.properties | 26 +++++++++ .../index_pt.properties | 31 ++++++++++ .../message_pt.properties | 25 +++++++++ .../MemoryUsageMonitor/index_pt.properties | 27 +++++++++ .../hudson/diagnosis/Messages_pt.properties | 28 ++++++++++ .../message_pt.properties | 27 +++++++++ .../OldDataMonitor/manage_pt.properties | 56 +++++++++++++++++++ .../OldDataMonitor/message_pt.properties | 25 +++++++++ .../message_pt.properties | 26 +++++++++ .../hudson/init/impl/Messages_pt.properties | 24 ++++++++ .../LogRecorder/configure_pt.properties | 28 ++++++++++ .../logging/LogRecorder/delete_pt.properties | 24 ++++++++ .../LogRecorder/sidepanel_pt.properties | 26 +++++++++ .../LogRecorderManager/all_pt.properties | 23 ++++++++ .../LogRecorderManager/feeds_pt.properties | 25 +++++++++ .../LogRecorderManager/index_pt.properties | 27 +++++++++ .../LogRecorderManager/levels_pt.properties | 29 ++++++++++ .../LogRecorderManager/new_pt.properties | 23 ++++++++ .../sidepanel_pt.properties | 28 ++++++++++ .../hudson/logging/Messages_pt.properties | 24 ++++++++ .../matrix/LabelAxis/config_pt.properties | 26 +++++++++ .../matrix/LabelExpAxis/config_pt.properties | 24 ++++++++ .../MatrixBuild/ajaxMatrix_pt.properties | 23 ++++++++ .../confirmDeleteAll_pt.properties | 26 +++++++++ .../matrix/MatrixBuild/delete_pt.properties | 24 ++++++++ .../MatrixProject/ajaxMatrix_pt.properties | 23 ++++++++ .../configure-entries_pt.properties | 32 +++++++++++ .../matrix/MatrixProject/index_pt.properties | 25 +++++++++ .../MatrixProject/newJobDetail_pt.properties | 26 +++++++++ .../hudson/matrix/Messages_pt.properties | 38 +++++++++++++ .../matrix/TextAxis/config_pt.properties | 24 ++++++++ .../config_pt.properties | 23 ++++++++ .../DiskSpace/cause_pt.properties | 24 ++++++++ .../node_monitors/Messages_pt.properties | 33 +++++++++++ .../message_pt.properties | 27 +++++++++ .../Data/cause_pt.properties | 23 ++++++++ .../inProgress_pt.properties | 23 ++++++++ .../EmptyChangeLogSet/digest_pt.properties | 23 ++++++++ .../hudson/scm/Messages_pt.properties | 25 +++++++++ .../scm/SCM/project-changes_pt.properties | 25 +++++++++ .../hudson/search/Messages_pt.properties | 23 ++++++++ .../search/Search/search-failed_pt.properties | 24 ++++++++ .../UserSearchProperty/config_pt.properties | 24 ++++++++ .../BuildHistoryWidget/entries_pt.properties | 24 ++++++++ .../widgets/HistoryWidget/entry_pt.properties | 24 ++++++++ .../widgets/HistoryWidget/index_pt.properties | 26 +++++++++ .../hudson/widgets/Messages_pt.properties | 23 ++++++++ .../configure_pt.properties | 23 ++++++++ .../test/SleepBuilder/config_pt.properties | 23 ++++++++ 49 files changed, 1283 insertions(+) create mode 100644 core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses_pt.properties create mode 100644 core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt.properties create mode 100644 core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message_pt.properties create mode 100644 core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index_pt.properties create mode 100644 core/src/main/resources/hudson/diagnosis/Messages_pt.properties create mode 100644 core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message_pt.properties create mode 100644 core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt.properties create mode 100644 core/src/main/resources/hudson/diagnosis/OldDataMonitor/message_pt.properties create mode 100644 core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message_pt.properties create mode 100644 core/src/main/resources/hudson/init/impl/Messages_pt.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorder/configure_pt.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorder/delete_pt.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorder/sidepanel_pt.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorderManager/all_pt.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorderManager/feeds_pt.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorderManager/index_pt.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorderManager/levels_pt.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorderManager/new_pt.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt.properties create mode 100644 core/src/main/resources/hudson/logging/Messages_pt.properties create mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/config_pt.properties create mode 100644 core/src/main/resources/hudson/matrix/LabelExpAxis/config_pt.properties create mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt.properties create mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_pt.properties create mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt.properties create mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt.properties create mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt.properties create mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_pt.properties create mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties create mode 100644 core/src/main/resources/hudson/matrix/Messages_pt.properties create mode 100644 core/src/main/resources/hudson/matrix/TextAxis/config_pt.properties create mode 100644 core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config_pt.properties create mode 100644 core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties create mode 100644 core/src/main/resources/hudson/node_monitors/Messages_pt.properties create mode 100644 core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt.properties create mode 100644 core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause_pt.properties create mode 100644 core/src/main/resources/hudson/scm/AbstractScmTagAction/inProgress_pt.properties create mode 100644 core/src/main/resources/hudson/scm/EmptyChangeLogSet/digest_pt.properties create mode 100644 core/src/main/resources/hudson/scm/Messages_pt.properties create mode 100644 core/src/main/resources/hudson/scm/SCM/project-changes_pt.properties create mode 100644 core/src/main/resources/hudson/search/Messages_pt.properties create mode 100644 core/src/main/resources/hudson/search/Search/search-failed_pt.properties create mode 100644 core/src/main/resources/hudson/search/UserSearchProperty/config_pt.properties create mode 100644 core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_pt.properties create mode 100644 core/src/main/resources/hudson/widgets/HistoryWidget/entry_pt.properties create mode 100644 core/src/main/resources/hudson/widgets/HistoryWidget/index_pt.properties create mode 100644 core/src/main/resources/hudson/widgets/Messages_pt.properties create mode 100644 test/src/main/resources/org/jvnet/hudson/test/ComputerConnectorTester/configure_pt.properties create mode 100644 test/src/main/resources/org/jvnet/hudson/test/SleepBuilder/config_pt.properties diff --git a/core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses_pt.properties b/core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses_pt.properties new file mode 100644 index 0000000000..56d76f1f72 --- /dev/null +++ b/core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses_pt.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +# About {0} +about=Sobre +No\ information\ recorded=Sem informação registrada +3rd\ Party\ Dependencies=Dependência de terceiros diff --git a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt.properties b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt.properties new file mode 100644 index 0000000000..ce50b73008 --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt.properties @@ -0,0 +1,31 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +JENKINS_HOME\ is\ almost\ full=o JENKINS_HOME está quase cheio +description.2=Para previnir esse problema, faça alguma coisa agora. +description.1=O seu JENKINS_HOME ({0}) está quase cheio. \ +Quando esse diretório estiver lotado ocorrerão alguns estragos, pois o Jenkins não pode gravar mais dado nenhum. +solution.2=Mova o JENKINS_HOME para uma partição maior. \ +Veja a nossa Wiki para aprender como fazer isso. +blurb=JENKINS_HOME está quase cheio +solution.1=Limpe alguns arquivos dessa partição para liberar mais espaço. + diff --git a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message_pt.properties b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message_pt.properties new file mode 100644 index 0000000000..d2190085e7 --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message_pt.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Dismiss=Dispensar +blurb=Seu diretório de dados do Jenkins "{0}" (conhecido como JENKINS_HOME) está quase cheio. Você deve fazer alguma coisa antes que ele fique completamente cheio. +Tell\ me\ more=Mais detalhes diff --git a/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index_pt.properties b/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index_pt.properties new file mode 100644 index 0000000000..0e614a440e --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index_pt.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Short=Curto +Timespan=intervalo de tempo +JVM\ Memory\ Usage=Uso de memória da JVM +Medium=Médio +Long=Longo diff --git a/core/src/main/resources/hudson/diagnosis/Messages_pt.properties b/core/src/main/resources/hudson/diagnosis/Messages_pt.properties new file mode 100644 index 0000000000..4c906829cf --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/Messages_pt.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +MemoryUsageMonitor.USED=Usado +MemoryUsageMonitor.TOTAL=Total +OldDataMonitor.DisplayName=Gerenciar dados antigos +HudsonHomeDiskUsageMonitor.DisplayName=Monitor de uso de disco +OldDataMonitor.Description=Limpar arquivos de configurações de plugins antigos e versões anteriores. + diff --git a/core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message_pt.properties b/core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message_pt.properties new file mode 100644 index 0000000000..c3a78827e1 --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message_pt.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +# Descriptor {0} from plugin {2} with display name {1} +problem= +# The following extensions have no ID value and therefore likely cause a problem. Please upgrade these plugins if they are not the latest, \ +# and if they are the latest, please file a bug so that we can fix them. +blurb= diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt.properties b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt.properties new file mode 100644 index 0000000000..d29ccf52ea --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt.properties @@ -0,0 +1,56 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Type=Tipo +blurb.6=É aceitável deixar esses dados ilegíveis nesses arquivos,o Jenkins vai ignorá-los. \ +Para evitar essas mensagens no log de startup do Jenkins, você pode remover esses dados regravando os arquivos usando o botão abaixo. +Discard\ Unreadable\ Data=Descartar dados ilegíveis +blurb.4=Eventualmente o código que suporta essas migrações de dados pode ser removido. A compatibilidade será \ +mantida por pelo menos 150 releases antes de uma mudança de estrutura. As versões mais antigas que essa \ +em negrito abaixo, é recomendado que regrave esses arquivos. +Version=Versão +Upgrade=Upgrade +blurb.5=(downgrade assim que for possível com a versão selecionada) +Resave\ data\ files\ with\ structure\ changes\ no\ newer\ than\ Jenkins=Regravar os arquivos de dados com a mudança de estrutura sem ser mais nova que o Jenkins +blurb.2=Algumas vezes ocorre erro ao ler os dados (se o plugin adiciona algum dado que depois é \ +desativado, se o código de migração não estiver escrito com as mudanças de estrutura, ou se o Jenkins sofreu \ +downgraded depois de tiver escrito algum dado que é ilegível por uma versão mais antiga). \ +Esses erros são logados,mas o dado ilegível será ignorado, permitindo ao Jenkins iniciar e \ +funcionar corretamente. +Error=Erro +Unreadable\ Data=Dado ilegível +blurb.1=Quando existirem mudanças em como o dado é armazenado no disco, o Jenkins usa a seguinte estratégia: \ +o dado é migrado para a nova estrutura quando for carregado, mas o arquivo não é regravado no novo formato. \ +Isso permite um downgrade do Jenkins se necessário, entretando pode também deixar dados no disco em formato \ +antigo por tempo indeterminado. A tabela abaixo lista os arquivos que contém esses dados, \ +as versões do Jenkins e quando a estrutura de dados foi alterada. + +No\ old\ data\ was\ found.=Nenhum dado antigo foi encontrado. +blurb.3=O formulário abaixo pode ser usado para regravar os arquivos no formato atual. Fazer isso significa \ +fazer um downgrade para uma versão do Jenkins mais antiga do que a selecionada,ele não conseguirá ler os dados \ +no novo formato. Note que simplesmemnte usando o Jenkins para criar e configurar jobs \ +e rodar builds pode gravar dados que não serão lidos por versões antigas do Jenkins, mesmo quando \ +esse formulário não for usado. Se algum dado ilegível der erro no lado direito da tabela \ +abaixo, esse dado será perdido quando o arquivo for regravado. +Name=Nome +Manage\ Old\ Data=Gerenciar dado antigo + diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message_pt.properties b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message_pt.properties new file mode 100644 index 0000000000..5407a94126 --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message_pt.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +You\ have\ data\ stored\ in\ an\ older\ format\ and/or\ unreadable\ data.=Você tem dados armazenados em um formato antigo e/ou ilegível. +Dismiss=Desconsiderar +Manage=Gerenciar diff --git a/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message_pt.properties b/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message_pt.properties new file mode 100644 index 0000000000..42fb4da7f2 --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message_pt.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Dismiss= +More\ Info= +# It appears that your reverse proxy set up is broken. +blurb= diff --git a/core/src/main/resources/hudson/init/impl/Messages_pt.properties b/core/src/main/resources/hudson/init/impl/Messages_pt.properties new file mode 100644 index 0000000000..b704748f4d --- /dev/null +++ b/core/src/main/resources/hudson/init/impl/Messages_pt.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +GroovyInitScript.init=Executar um script init definido pelo usuário +InitialUserContent.init=Preparando o conteúdo inicial diff --git a/core/src/main/resources/hudson/logging/LogRecorder/configure_pt.properties b/core/src/main/resources/hudson/logging/LogRecorder/configure_pt.properties new file mode 100644 index 0000000000..9829a15548 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorder/configure_pt.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Log\ level=Nível de log +Logger=Logger +Save=Gravar +Loggers=Loggers +List\ of\ loggers\ and\ the\ log\ levels\ to\ record=Lista de loggers e seus níveis de log +Name=Nome diff --git a/core/src/main/resources/hudson/logging/LogRecorder/delete_pt.properties b/core/src/main/resources/hudson/logging/LogRecorder/delete_pt.properties new file mode 100644 index 0000000000..ca340b7c75 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorder/delete_pt.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Are\ you\ sure\ about\ deleting\ this\ log\ recorder?=Tem certeza que deseja remover esse registro de log? +Yes=Sim diff --git a/core/src/main/resources/hudson/logging/LogRecorder/sidepanel_pt.properties b/core/src/main/resources/hudson/logging/LogRecorder/sidepanel_pt.properties new file mode 100644 index 0000000000..bd3c925316 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorder/sidepanel_pt.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Back\ to\ Loggers=Voltar aos loggers +Delete=Remover +Log\ records=Registros de log +Configure=Configurar diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/all_pt.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/all_pt.properties new file mode 100644 index 0000000000..769c8b7d5a --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/all_pt.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Jenkins\ Log=Log do Jenkins diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/feeds_pt.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/feeds_pt.properties new file mode 100644 index 0000000000..57805cb87e --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/feeds_pt.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +>\ SEVERE=>\ SEVERE +>\ WARNING=>\ WARNING +All=Tudo diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/index_pt.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/index_pt.properties new file mode 100644 index 0000000000..ac64eaf291 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/index_pt.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +All\ Jenkins\ Logs=Todos os logs do Jenkins +Log\ Recorders=Registros de log +Log=Log +Add\ new\ log\ recorder=Adicionar novo registro de log +Name=Nome diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/levels_pt.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/levels_pt.properties new file mode 100644 index 0000000000..7b77a1d1d4 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/levels_pt.properties @@ -0,0 +1,29 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Adjust\ Levels=Ajustar níveis +url=http://wiki.jenkins-ci.org//x/YYI5Ag +Submit=Enviar +Logger\ Configuration=Configuração de logger +defaultLoggerMsg=Um logger sem nome será o logger padrão. Esse nível será herdado por todos os loggers sem um nível configurado. +Level=Nível +Name=Nome diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/new_pt.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/new_pt.properties new file mode 100644 index 0000000000..9740df6a59 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/new_pt.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Name=Nome diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt.properties new file mode 100644 index 0000000000..7363e0e633 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Manage\ Jenkins=Gerenciar Jenkins +Logger\ List=Lista de logger +Log\ Levels=Níveis de log +All\ Logs=Todos os logs +New\ Log\ Recorder=Novo registro de log +Back\ to\ Dashboard=Voltar ao painel principal diff --git a/core/src/main/resources/hudson/logging/Messages_pt.properties b/core/src/main/resources/hudson/logging/Messages_pt.properties new file mode 100644 index 0000000000..578baad4ed --- /dev/null +++ b/core/src/main/resources/hudson/logging/Messages_pt.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +LogRecorderManager.DisplayName=log +LogRecorderManager.init=Inicializando registros de log diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/config_pt.properties b/core/src/main/resources/hudson/matrix/LabelAxis/config_pt.properties new file mode 100644 index 0000000000..7657d04b41 --- /dev/null +++ b/core/src/main/resources/hudson/matrix/LabelAxis/config_pt.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Node/Label=Nó +Labels=Label +Individual\ nodes=Nós individuais +Name=Nome diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/config_pt.properties b/core/src/main/resources/hudson/matrix/LabelExpAxis/config_pt.properties new file mode 100644 index 0000000000..d6a9e3b280 --- /dev/null +++ b/core/src/main/resources/hudson/matrix/LabelExpAxis/config_pt.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Label\ Expressions=Expressões +Name=Nome diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt.properties new file mode 100644 index 0000000000..e9ba0dd2de --- /dev/null +++ b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Not\ run=Não executado diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_pt.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_pt.properties new file mode 100644 index 0000000000..c38674beb4 --- /dev/null +++ b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_pt.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +cannotMsg=Não foi possível remover esse build: {0} +Are\ you\ sure\ about\ deleting\ the\ build\ and\ all\ configurations\ in\ this\ build?=Tem certeza que deseja remover esse build e todas suas configurações ? +Yes=Sim +Warning=Aviso diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt.properties new file mode 100644 index 0000000000..10ed3c8c47 --- /dev/null +++ b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Delete\ Build=Remover build +Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=Remover esse build e todas suas configurações diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt.properties new file mode 100644 index 0000000000..c989766aa3 --- /dev/null +++ b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Not\ configured=Não configurado diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt.properties new file mode 100644 index 0000000000..4c5fec6243 --- /dev/null +++ b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt.properties @@ -0,0 +1,32 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Advanced\ Project\ Options=Opções avançadas de projeto +Directory=Diretório +Filter=Filtro +Directory\ for\ sub-builds=Diretório dos sub-builds +Display\ Name=Nome de exibição +Use\ custom\ workspace=Usar workspace customizado +Combination\ Filter=Filtro combinado +Execution\ Strategy=Estratégia de execução +Configuration\ Matrix=Configuração da matriz +Add\ axis=Adicionar eixo diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_pt.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_pt.properties new file mode 100644 index 0000000000..9c882a6368 --- /dev/null +++ b/core/src/main/resources/hudson/matrix/MatrixProject/index_pt.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Project\ name=Nome do projeto +Latest\ Test\ Result=Último resultado de teste +Project=Projeto diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties new file mode 100644 index 0000000000..8e262d8ece --- /dev/null +++ b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +# \ +# Suitable for projects that need a large number of different configurations, \ +# such as testing on multiple environments, platform-specific builds, etc. +body=Corpo diff --git a/core/src/main/resources/hudson/matrix/Messages_pt.properties b/core/src/main/resources/hudson/matrix/Messages_pt.properties new file mode 100644 index 0000000000..f329c9ae30 --- /dev/null +++ b/core/src/main/resources/hudson/matrix/Messages_pt.properties @@ -0,0 +1,38 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +MatrixBuild.Completed={0} completado com resultado {1} +MatrixRun.KeptBecauseOfParent=Mantido porque {0} será mantido +TextArea.DisplayName=Eixo definido pelo usuário +MatrixProject.DuplicateAxisName=Nome do eixo duplicado +MatrixBuild.Triggering=Disparando {0} +LabelAxis.DisplayName=Slaves +JDKAxis.DisplayName=JDK +MatrixBuild.Interrupting=Interrompendo {0} +MatrixBuild.depends_on_this={0} depended disso. +LabelExpAxis.DisplayName=Label +MatrixBuild.AppearsCancelled= {0} parece estar cancelado +MatrixConfiguration.Pronoun=Configuração +MatrixProject.Pronoun=Projeto com multi-configurações +MatrixProject.DisplayName=Construir Build projeto com multi-configurações +MatrixBuild.Cancelled={0} cancelado + diff --git a/core/src/main/resources/hudson/matrix/TextAxis/config_pt.properties b/core/src/main/resources/hudson/matrix/TextAxis/config_pt.properties new file mode 100644 index 0000000000..5c750ded20 --- /dev/null +++ b/core/src/main/resources/hudson/matrix/TextAxis/config_pt.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Values=Valores +Name=Nome diff --git a/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config_pt.properties b/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config_pt.properties new file mode 100644 index 0000000000..60579f857c --- /dev/null +++ b/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config_pt.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Free\ Space\ Threshold=Limite de espaço livre diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties new file mode 100644 index 0000000000..bc779a088a --- /dev/null +++ b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +# Disk space is too low. Only {0}GB left on {1}. +blurb=Espaço em disco está acabando, apenas {0}Gb livre em {1}. diff --git a/core/src/main/resources/hudson/node_monitors/Messages_pt.properties b/core/src/main/resources/hudson/node_monitors/Messages_pt.properties new file mode 100644 index 0000000000..5cb669cd75 --- /dev/null +++ b/core/src/main/resources/hudson/node_monitors/Messages_pt.properties @@ -0,0 +1,33 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +ClockMonitor.DisplayName=Diferença de tempo +ResponseTimeMonitor.TimeOut=Time out da tentativa {0} +AbstractNodeMonitorDescriptor.NoDataYet=Sem informação +TemporarySpaceMonitor.DisplayName=Espaço de área temporária +DiskSpaceMonitor.MarkedOnline=Colocar {0} online novamente se existir espaço em disco suficiente +ResponseTimeMonitor.DisplayName=Tempo de resposta +DiskSpaceMonitor.MarkedOffline=Deixar {0} temporariamente offline devido à falta de espaço em disco +DiskSpaceMonitor.DisplayName=Espaço em disco livre +SwapSpaceMonitor.DisplayName=Espaço de swap livre +ArchitectureMonitor.DisplayName=Arquitetura +ResponseTimeMonitor.MarkedOffline=Deixar {0} offline porque não está respondendo diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt.properties new file mode 100644 index 0000000000..bb297f44b5 --- /dev/null +++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Dismiss=Dispensar +blurb=O Jenkins deixou alguns slaves offlineporque a href="{0}/computer/">suas métricas estavam abaixo do limite. \ + Se você não quiser que o Jenkins faça isso, \ + mude a configuração. + diff --git a/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause_pt.properties b/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause_pt.properties new file mode 100644 index 0000000000..70ffc5b489 --- /dev/null +++ b/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause_pt.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Ping\ response\ time\ is\ too\ long\ or\ timed\ out.=O tempo de resposta do ping está muito alto ou deu time out diff --git a/core/src/main/resources/hudson/scm/AbstractScmTagAction/inProgress_pt.properties b/core/src/main/resources/hudson/scm/AbstractScmTagAction/inProgress_pt.properties new file mode 100644 index 0000000000..373b183aec --- /dev/null +++ b/core/src/main/resources/hudson/scm/AbstractScmTagAction/inProgress_pt.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Tagging\ is\ in\ progress\:=Tagging em processamento diff --git a/core/src/main/resources/hudson/scm/EmptyChangeLogSet/digest_pt.properties b/core/src/main/resources/hudson/scm/EmptyChangeLogSet/digest_pt.properties new file mode 100644 index 0000000000..4692c8a221 --- /dev/null +++ b/core/src/main/resources/hudson/scm/EmptyChangeLogSet/digest_pt.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +No\ changes.=Sem mudanças. diff --git a/core/src/main/resources/hudson/scm/Messages_pt.properties b/core/src/main/resources/hudson/scm/Messages_pt.properties new file mode 100644 index 0000000000..41e2e32f98 --- /dev/null +++ b/core/src/main/resources/hudson/scm/Messages_pt.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +SCM.Permissions.Title=SCM +SCM.TagPermission.Description=Essa permissão deixa usuários criar uma nova tag no repositório do código fonte para um determinado build. +NullSCM.DisplayName=Nenhum diff --git a/core/src/main/resources/hudson/scm/SCM/project-changes_pt.properties b/core/src/main/resources/hudson/scm/SCM/project-changes_pt.properties new file mode 100644 index 0000000000..149f6c1189 --- /dev/null +++ b/core/src/main/resources/hudson/scm/SCM/project-changes_pt.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +No\ builds.=Sem builds. +No\ changes\ in\ any\ of\ the\ builds.=Sem mudanças em nenhum dos builds. +detail=detalhe diff --git a/core/src/main/resources/hudson/search/Messages_pt.properties b/core/src/main/resources/hudson/search/Messages_pt.properties new file mode 100644 index 0000000000..a5181b0b41 --- /dev/null +++ b/core/src/main/resources/hudson/search/Messages_pt.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +UserSearchProperty.DisplayName=Definição para pesquisa diff --git a/core/src/main/resources/hudson/search/Search/search-failed_pt.properties b/core/src/main/resources/hudson/search/Search/search-failed_pt.properties new file mode 100644 index 0000000000..5208ca74f6 --- /dev/null +++ b/core/src/main/resources/hudson/search/Search/search-failed_pt.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Nothing\ seems\ to\ match.=Não foi encontrado nenhum correspondente. +Search\ for=Buscar por diff --git a/core/src/main/resources/hudson/search/UserSearchProperty/config_pt.properties b/core/src/main/resources/hudson/search/UserSearchProperty/config_pt.properties new file mode 100644 index 0000000000..7a2de4eb93 --- /dev/null +++ b/core/src/main/resources/hudson/search/UserSearchProperty/config_pt.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Case-sensitivity=Diferenciar maiúsculas/minúsculas +Insensitive\ search\ tool=Busca sem diferenciar maiúsculas/minúsculas diff --git a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_pt.properties b/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_pt.properties new file mode 100644 index 0000000000..332c19dfad --- /dev/null +++ b/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_pt.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +pending=pendente +cancel\ this\ build=cancelar esse build diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entry_pt.properties b/core/src/main/resources/hudson/widgets/HistoryWidget/entry_pt.properties new file mode 100644 index 0000000000..8db8880a7b --- /dev/null +++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entry_pt.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Console\ Output=Saída do console + diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index_pt.properties b/core/src/main/resources/hudson/widgets/HistoryWidget/index_pt.properties new file mode 100644 index 0000000000..7cce25757f --- /dev/null +++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index_pt.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +for\ failures=para falhas +for\ all=para todos +More\ ...=Mais ... +trend=tendência diff --git a/core/src/main/resources/hudson/widgets/Messages_pt.properties b/core/src/main/resources/hudson/widgets/Messages_pt.properties new file mode 100644 index 0000000000..2c4259df57 --- /dev/null +++ b/core/src/main/resources/hudson/widgets/Messages_pt.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +BuildHistoryWidget.DisplayName=Histórico de builds diff --git a/test/src/main/resources/org/jvnet/hudson/test/ComputerConnectorTester/configure_pt.properties b/test/src/main/resources/org/jvnet/hudson/test/ComputerConnectorTester/configure_pt.properties new file mode 100644 index 0000000000..ccd0ece5e4 --- /dev/null +++ b/test/src/main/resources/org/jvnet/hudson/test/ComputerConnectorTester/configure_pt.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Save=Gravar diff --git a/test/src/main/resources/org/jvnet/hudson/test/SleepBuilder/config_pt.properties b/test/src/main/resources/org/jvnet/hudson/test/SleepBuilder/config_pt.properties new file mode 100644 index 0000000000..7836725959 --- /dev/null +++ b/test/src/main/resources/org/jvnet/hudson/test/SleepBuilder/config_pt.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Time=Tempo -- GitLab From 0765031e077974643a4ab37bd24153ca3a3bf85f Mon Sep 17 00:00:00 2001 From: Fernando Boaglio Date: Sun, 5 Jan 2014 00:58:35 -0200 Subject: [PATCH 0646/1630] pt_BR translation (diagnosis + matrix + logging) --- .../thirdPartyLicenses_pt.properties | 4 +- .../index_pt.properties | 15 +++--- .../message_pt.properties | 2 +- .../MemoryUsageMonitor/index_pt.properties | 4 +- .../hudson/diagnosis/Messages_pt.properties | 2 +- .../OldDataMonitor/manage_pt.properties | 48 +++++++++---------- .../OldDataMonitor/message_pt.properties | 2 +- .../hudson/init/impl/Messages_pt.properties | 5 +- .../LogRecorder/configure_pt.properties | 4 +- .../LogRecorderManager/levels_pt.properties | 9 ++-- .../sidepanel_pt.properties | 2 +- .../matrix/LabelAxis/config_pt.properties | 5 +- .../matrix/LabelExpAxis/config_pt.properties | 3 +- .../MatrixBuild/ajaxMatrix_pt.properties | 2 +- .../confirmDeleteAll_pt.properties | 5 +- .../matrix/MatrixBuild/delete_pt.properties | 3 +- .../MatrixProject/ajaxMatrix_pt.properties | 3 +- .../configure-entries_pt.properties | 13 ++--- .../matrix/MatrixProject/index_pt.properties | 3 +- .../MatrixProject/newJobDetail_pt.properties | 2 +- .../hudson/matrix/Messages_pt.properties | 12 +++-- .../config_pt.properties | 3 +- .../DiskSpace/cause_pt.properties | 2 +- .../node_monitors/Messages_pt.properties | 16 +++---- .../message_pt.properties | 6 +-- .../Data/cause_pt.properties | 2 +- .../EmptyChangeLogSet/digest_pt.properties | 2 +- .../hudson/scm/Messages_pt.properties | 3 +- .../scm/SCM/project-changes_pt.properties | 2 +- .../hudson/search/Messages_pt.properties | 3 +- .../search/Search/search-failed_pt.properties | 3 +- .../UserSearchProperty/config_pt.properties | 6 ++- .../widgets/HistoryWidget/entry_pt.properties | 2 +- .../widgets/HistoryWidget/index_pt.properties | 2 +- .../hudson/widgets/Messages_pt.properties | 3 +- 35 files changed, 110 insertions(+), 93 deletions(-) diff --git a/core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses_pt.properties b/core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses_pt.properties index 56d76f1f72..5b87cb299c 100644 --- a/core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses_pt.properties +++ b/core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses_pt.properties @@ -22,5 +22,5 @@ # About {0} about=Sobre -No\ information\ recorded=Sem informação registrada -3rd\ Party\ Dependencies=Dependência de terceiros +No\ information\ recorded=Sem informa\u00e7\u00e3o registrada +3rd\ Party\ Dependencies=Depend\u00eancia de terceiros \ No newline at end of file diff --git a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt.properties b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt.properties index ce50b73008..c2ab796dee 100644 --- a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt.properties +++ b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt.properties @@ -20,12 +20,11 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -JENKINS_HOME\ is\ almost\ full=o JENKINS_HOME está quase cheio -description.2=Para previnir esse problema, faça alguma coisa agora. -description.1=O seu JENKINS_HOME ({0}) está quase cheio. \ -Quando esse diretório estiver lotado ocorrerão alguns estragos, pois o Jenkins não pode gravar mais dado nenhum. -solution.2=Mova o JENKINS_HOME para uma partição maior. \ +JENKINS_HOME\ is\ almost\ full=o JENKINS_HOME est\u00e1 quase cheio +description.2=Para previnir esse problema, fa\u00e7a alguma coisa agora. +description.1=O seu JENKINS_HOME ({0}) est\u00e1 quase cheio. \ +Quando esse diret\u00f3rio estiver lotado ocorrer\u00e3o alguns estragos, pois o Jenkins n\u00e3o pode gravar mais dado nenhum. +solution.2=Mova o JENKINS_HOME para uma parti\u00e7\u00e3o maior. \ Veja a nossa Wiki para aprender como fazer isso. -blurb=JENKINS_HOME está quase cheio -solution.1=Limpe alguns arquivos dessa partição para liberar mais espaço. - +blurb=JENKINS_HOME est\u00e1 quase cheio +solution.1=Limpe alguns arquivos dessa parti\u00e7\u00e3o para liberar mais espa\u00e7o. diff --git a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message_pt.properties b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message_pt.properties index d2190085e7..984a35b528 100644 --- a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message_pt.properties +++ b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message_pt.properties @@ -21,5 +21,5 @@ # THE SOFTWARE. Dismiss=Dispensar -blurb=Seu diretório de dados do Jenkins "{0}" (conhecido como JENKINS_HOME) está quase cheio. Você deve fazer alguma coisa antes que ele fique completamente cheio. +blurb=Seu diret\u00f3rio de dados do Jenkins "{0}" (conhecido como JENKINS_HOME) est\u00e1 quase cheio. Voc\u00ea deve fazer alguma coisa antes que ele fique completamente cheio. Tell\ me\ more=Mais detalhes diff --git a/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index_pt.properties b/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index_pt.properties index 0e614a440e..2c3b877e68 100644 --- a/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index_pt.properties +++ b/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index_pt.properties @@ -22,6 +22,6 @@ Short=Curto Timespan=intervalo de tempo -JVM\ Memory\ Usage=Uso de memória da JVM -Medium=Médio +JVM\ Memory\ Usage=Uso de mem\u00f3ria da JVM +Medium=M\u00e9dio Long=Longo diff --git a/core/src/main/resources/hudson/diagnosis/Messages_pt.properties b/core/src/main/resources/hudson/diagnosis/Messages_pt.properties index 4c906829cf..bc408428be 100644 --- a/core/src/main/resources/hudson/diagnosis/Messages_pt.properties +++ b/core/src/main/resources/hudson/diagnosis/Messages_pt.properties @@ -24,5 +24,5 @@ MemoryUsageMonitor.USED=Usado MemoryUsageMonitor.TOTAL=Total OldDataMonitor.DisplayName=Gerenciar dados antigos HudsonHomeDiskUsageMonitor.DisplayName=Monitor de uso de disco -OldDataMonitor.Description=Limpar arquivos de configurações de plugins antigos e versões anteriores. +OldDataMonitor.Description=Limpar arquivos de configura\u00e7\u00f5es de plugins antigos e vers\u00f5es anteriores. diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt.properties b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt.properties index d29ccf52ea..9228d86864 100644 --- a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt.properties +++ b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt.properties @@ -21,36 +21,36 @@ # THE SOFTWARE. Type=Tipo -blurb.6=É aceitável deixar esses dados ilegíveis nesses arquivos,o Jenkins vai ignorá-los. \ -Para evitar essas mensagens no log de startup do Jenkins, você pode remover esses dados regravando os arquivos usando o botão abaixo. -Discard\ Unreadable\ Data=Descartar dados ilegíveis -blurb.4=Eventualmente o código que suporta essas migrações de dados pode ser removido. A compatibilidade será \ -mantida por pelo menos 150 releases antes de uma mudança de estrutura. As versões mais antigas que essa \ -em negrito abaixo, é recomendado que regrave esses arquivos. -Version=Versão +blurb.6=\u00c9 aceit\u00e1vel deixar esses dados ileg\u00edveis nesses arquivos,o Jenkins vai ignor\u00e1-los. \ +Para evitar essas mensagens no log de startup do Jenkins, voc\u00ea pode remover esses dados regravando os arquivos usando o bot\u00e3o abaixo. +Discard\ Unreadable\ Data=Descartar dados ileg\u00edveis +blurb.4=Eventualmente o c\u00f3digo que suporta essas migra\u00e7\u00f5es de dados pode ser removido. A compatibilidade ser\u00e1 \ +mantida por pelo menos 150 releases antes de uma mudan\u00e7a de estrutura. As vers\u00f5es mais antigas que essa \ +em negrito abaixo, \u00e9 recomendado que regrave esses arquivos. +Version=Vers\u00e3o Upgrade=Upgrade -blurb.5=(downgrade assim que for possível com a versão selecionada) -Resave\ data\ files\ with\ structure\ changes\ no\ newer\ than\ Jenkins=Regravar os arquivos de dados com a mudança de estrutura sem ser mais nova que o Jenkins -blurb.2=Algumas vezes ocorre erro ao ler os dados (se o plugin adiciona algum dado que depois é \ -desativado, se o código de migração não estiver escrito com as mudanças de estrutura, ou se o Jenkins sofreu \ -downgraded depois de tiver escrito algum dado que é ilegível por uma versão mais antiga). \ -Esses erros são logados,mas o dado ilegível será ignorado, permitindo ao Jenkins iniciar e \ +blurb.5=(downgrade assim que for poss\u00edvel com a vers\u00e3o selecionada) +Resave\ data\ files\ with\ structure\ changes\ no\ newer\ than\ Jenkins=Regravar os arquivos de dados com a mudan\u00e7a de estrutura sem ser mais nova que o Jenkins +blurb.2=Algumas vezes ocorre erro ao ler os dados (se o plugin adiciona algum dado que depois \u00e9 \ +desativado, se o c\u00f3digo de migra\u00e7\u00e3o n\u00e3o estiver escrito com as mudan\u00e7as de estrutura, ou se o Jenkins sofreu \ +downgraded depois de tiver escrito algum dado que \u00e9 ileg\u00edvel por uma vers\u00e3o mais antiga). \ +Esses erros s\u00e3o logados,mas o dado ileg\u00edvel ser\u00e1 ignorado, permitindo ao Jenkins iniciar e \ funcionar corretamente. Error=Erro -Unreadable\ Data=Dado ilegível -blurb.1=Quando existirem mudanças em como o dado é armazenado no disco, o Jenkins usa a seguinte estratégia: \ -o dado é migrado para a nova estrutura quando for carregado, mas o arquivo não é regravado no novo formato. \ -Isso permite um downgrade do Jenkins se necessário, entretando pode também deixar dados no disco em formato \ -antigo por tempo indeterminado. A tabela abaixo lista os arquivos que contém esses dados, \ -as versões do Jenkins e quando a estrutura de dados foi alterada. +Unreadable\ Data=Dado ileg\u00edvel +blurb.1=Quando existirem mudan\u00e7as em como o dado \u00e9 armazenado no disco, o Jenkins usa a seguinte estrat\u00e9gia: \ +o dado \u00e9 migrado para a nova estrutura quando for carregado, mas o arquivo n\u00e3o \u00e9 regravado no novo formato. \ +Isso permite um downgrade do Jenkins se necess\u00e1rio, entretando pode tamb\u00e9m deixar dados no disco em formato \ +antigo por tempo indeterminado. A tabela abaixo lista os arquivos que cont\u00e9m esses dados, \ +as vers\u00f5es do Jenkins e quando a estrutura de dados foi alterada. No\ old\ data\ was\ found.=Nenhum dado antigo foi encontrado. -blurb.3=O formulário abaixo pode ser usado para regravar os arquivos no formato atual. Fazer isso significa \ -fazer um downgrade para uma versão do Jenkins mais antiga do que a selecionada,ele não conseguirá ler os dados \ +blurb.3=O formul\u00e1rio abaixo pode ser usado para regravar os arquivos no formato atual. Fazer isso significa \ +fazer um downgrade para uma vers\u00e3o do Jenkins mais antiga do que a selecionada,ele n\u00e3o conseguir\u00e1 ler os dados \ no novo formato. Note que simplesmemnte usando o Jenkins para criar e configurar jobs \ -e rodar builds pode gravar dados que não serão lidos por versões antigas do Jenkins, mesmo quando \ -esse formulário não for usado. Se algum dado ilegível der erro no lado direito da tabela \ -abaixo, esse dado será perdido quando o arquivo for regravado. +e rodar builds pode gravar dados que n\u00e3o ser\u00e3o lidos por vers\u00f5es antigas do Jenkins, mesmo quando \ +esse formul\u00e1rio n\u00e3o for usado. Se algum dado ileg\u00edvel der erro no lado direito da tabela \ +abaixo, esse dado ser\u00e1 perdido quando o arquivo for regravado. Name=Nome Manage\ Old\ Data=Gerenciar dado antigo diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message_pt.properties b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message_pt.properties index 5407a94126..245268f57c 100644 --- a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message_pt.properties +++ b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message_pt.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -You\ have\ data\ stored\ in\ an\ older\ format\ and/or\ unreadable\ data.=Você tem dados armazenados em um formato antigo e/ou ilegível. +You\ have\ data\ stored\ in\ an\ older\ format\ and/or\ unreadable\ data.=Voc\u00ea tem dados armazenados em um formato antigo e/ou ileg\u00edvel. Dismiss=Desconsiderar Manage=Gerenciar diff --git a/core/src/main/resources/hudson/init/impl/Messages_pt.properties b/core/src/main/resources/hudson/init/impl/Messages_pt.properties index b704748f4d..75d0364bf0 100644 --- a/core/src/main/resources/hudson/init/impl/Messages_pt.properties +++ b/core/src/main/resources/hudson/init/impl/Messages_pt.properties @@ -20,5 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GroovyInitScript.init=Executar um script init definido pelo usuário -InitialUserContent.init=Preparando o conteúdo inicial +GroovyInitScript.init=Executar um script init definido pelo usu\u00e1rio +InitialUserContent.init=Preparando o conte\u00fado inicial + diff --git a/core/src/main/resources/hudson/logging/LogRecorder/configure_pt.properties b/core/src/main/resources/hudson/logging/LogRecorder/configure_pt.properties index 9829a15548..5210589508 100644 --- a/core/src/main/resources/hudson/logging/LogRecorder/configure_pt.properties +++ b/core/src/main/resources/hudson/logging/LogRecorder/configure_pt.properties @@ -20,9 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Log\ level=Nível de log +Log\ level=N\u00edvel de log Logger=Logger Save=Gravar Loggers=Loggers -List\ of\ loggers\ and\ the\ log\ levels\ to\ record=Lista de loggers e seus níveis de log +List\ of\ loggers\ and\ the\ log\ levels\ to\ record=Lista de loggers e seus n\u00edveis de log Name=Nome diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/levels_pt.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/levels_pt.properties index 7b77a1d1d4..0aa78bd338 100644 --- a/core/src/main/resources/hudson/logging/LogRecorderManager/levels_pt.properties +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/levels_pt.properties @@ -20,10 +20,11 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Adjust\ Levels=Ajustar níveis +Adjust\ Levels=Ajustar n\u00edveis url=http://wiki.jenkins-ci.org//x/YYI5Ag Submit=Enviar -Logger\ Configuration=Configuração de logger -defaultLoggerMsg=Um logger sem nome será o logger padrão. Esse nível será herdado por todos os loggers sem um nível configurado. -Level=Nível +Logger\ Configuration=Configura\u00e7\u00e3o de logger +defaultLoggerMsg=Um logger sem nome ser\u00e1 o logger padr\u00e3o. Esse n\u00edvel ser\u00e1 herdado por todos os loggers sem um n\u00edvel configurado. +Level=N\u00edvel Name=Nome + diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt.properties index 7363e0e633..884c2af043 100644 --- a/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt.properties +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt.properties @@ -22,7 +22,7 @@ Manage\ Jenkins=Gerenciar Jenkins Logger\ List=Lista de logger -Log\ Levels=Níveis de log +Log\ Levels=N\u00edveis de log All\ Logs=Todos os logs New\ Log\ Recorder=Novo registro de log Back\ to\ Dashboard=Voltar ao painel principal diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/config_pt.properties b/core/src/main/resources/hudson/matrix/LabelAxis/config_pt.properties index 7657d04b41..2f8a88768e 100644 --- a/core/src/main/resources/hudson/matrix/LabelAxis/config_pt.properties +++ b/core/src/main/resources/hudson/matrix/LabelAxis/config_pt.properties @@ -20,7 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Node/Label=Nó +Node/Label=N\u00f3 Labels=Label -Individual\ nodes=Nós individuais +Individual\ nodes=N\u00f3s individuais Name=Nome + diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/config_pt.properties b/core/src/main/resources/hudson/matrix/LabelExpAxis/config_pt.properties index d6a9e3b280..f29f1d0e15 100644 --- a/core/src/main/resources/hudson/matrix/LabelExpAxis/config_pt.properties +++ b/core/src/main/resources/hudson/matrix/LabelExpAxis/config_pt.properties @@ -20,5 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Label\ Expressions=Expressões +Label\ Expressions=Express\u00f5es Name=Nome + diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt.properties index e9ba0dd2de..e55fc626b1 100644 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt.properties +++ b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Not\ run=Não executado +Not\ run=N\u00e3o executado diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_pt.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_pt.properties index c38674beb4..b9c7673ac8 100644 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_pt.properties +++ b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_pt.properties @@ -20,7 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -cannotMsg=Não foi possível remover esse build: {0} -Are\ you\ sure\ about\ deleting\ the\ build\ and\ all\ configurations\ in\ this\ build?=Tem certeza que deseja remover esse build e todas suas configurações ? +cannotMsg=N\u00e3o foi poss\u00edvel remover esse build: {0} +Are\ you\ sure\ about\ deleting\ the\ build\ and\ all\ configurations\ in\ this\ build?=Tem certeza que deseja remover esse build e todas suas configura\u00e7\u00f5es ? Yes=Sim Warning=Aviso + diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt.properties index 10ed3c8c47..82b53cf884 100644 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt.properties +++ b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt.properties @@ -21,4 +21,5 @@ # THE SOFTWARE. Delete\ Build=Remover build -Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=Remover esse build e todas suas configurações +Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=Remover esse build e todas suas configura\u00e7\u00f5es + diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt.properties index c989766aa3..46252b1ab6 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt.properties +++ b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt.properties @@ -20,4 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Not\ configured=Não configurado +Not\ configured=N\u00e3o configurado + diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt.properties index 4c5fec6243..7b8c986cb5 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt.properties +++ b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt.properties @@ -20,13 +20,14 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Advanced\ Project\ Options=Opções avançadas de projeto -Directory=Diretório +Advanced\ Project\ Options=Op\u00e7\u00f5es avan\u00e7adas de projeto +Directory=Diret\u00f3rio Filter=Filtro -Directory\ for\ sub-builds=Diretório dos sub-builds -Display\ Name=Nome de exibição +Directory\ for\ sub-builds=Diret\u00f3rio dos sub-builds +Display\ Name=Nome de exibi\u00e7\u00e3o Use\ custom\ workspace=Usar workspace customizado Combination\ Filter=Filtro combinado -Execution\ Strategy=Estratégia de execução -Configuration\ Matrix=Configuração da matriz +Execution\ Strategy=Estrat\u00e9gia de execu\u00e7\u00e3o +Configuration\ Matrix=Configura\u00e7\u00e3o da matriz Add\ axis=Adicionar eixo + diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_pt.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_pt.properties index 9c882a6368..16e21312ed 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_pt.properties +++ b/core/src/main/resources/hudson/matrix/MatrixProject/index_pt.properties @@ -21,5 +21,6 @@ # THE SOFTWARE. Project\ name=Nome do projeto -Latest\ Test\ Result=Último resultado de teste +Latest\ Test\ Result=\u00daltimo resultado de teste Project=Projeto + diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties index 8e262d8ece..554f6047b6 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties +++ b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties @@ -23,4 +23,4 @@ # \ # Suitable for projects that need a large number of different configurations, \ # such as testing on multiple environments, platform-specific builds, etc. -body=Corpo +body= diff --git a/core/src/main/resources/hudson/matrix/Messages_pt.properties b/core/src/main/resources/hudson/matrix/Messages_pt.properties index f329c9ae30..a1b2e13cbb 100644 --- a/core/src/main/resources/hudson/matrix/Messages_pt.properties +++ b/core/src/main/resources/hudson/matrix/Messages_pt.properties @@ -20,9 +20,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. + MatrixBuild.Completed={0} completado com resultado {1} -MatrixRun.KeptBecauseOfParent=Mantido porque {0} será mantido -TextArea.DisplayName=Eixo definido pelo usuário +MatrixRun.KeptBecauseOfParent=Mantido porque {0} ser\u00e1 mantido +TextArea.DisplayName=Eixo definido pelo usu\u00e1rio MatrixProject.DuplicateAxisName=Nome do eixo duplicado MatrixBuild.Triggering=Disparando {0} LabelAxis.DisplayName=Slaves @@ -31,8 +32,9 @@ MatrixBuild.Interrupting=Interrompendo {0} MatrixBuild.depends_on_this={0} depended disso. LabelExpAxis.DisplayName=Label MatrixBuild.AppearsCancelled= {0} parece estar cancelado -MatrixConfiguration.Pronoun=Configuração -MatrixProject.Pronoun=Projeto com multi-configurações -MatrixProject.DisplayName=Construir Build projeto com multi-configurações +MatrixConfiguration.Pronoun=Configura\u00e7\u00e3o +MatrixProject.Pronoun=Projeto com multi-configura\u00e7\u00f5es +MatrixProject.DisplayName=Construir Build projeto com multi-configura\u00e7\u00f5es MatrixBuild.Cancelled={0} cancelado + diff --git a/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config_pt.properties b/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config_pt.properties index 60579f857c..285498a0d9 100644 --- a/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config_pt.properties +++ b/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config_pt.properties @@ -20,4 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Free\ Space\ Threshold=Limite de espaço livre +Free\ Space\ Threshold=Limite de espa\u00e7o livre + diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties index bc779a088a..a34a5d7f01 100644 --- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties +++ b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties @@ -21,4 +21,4 @@ # THE SOFTWARE. # Disk space is too low. Only {0}GB left on {1}. -blurb=Espaço em disco está acabando, apenas {0}Gb livre em {1}. +blurb=Espa\u00e7o em disco est\u00e1 acabando, apenas {0}Gb livre em {1}. diff --git a/core/src/main/resources/hudson/node_monitors/Messages_pt.properties b/core/src/main/resources/hudson/node_monitors/Messages_pt.properties index 5cb669cd75..e9eb9c1b26 100644 --- a/core/src/main/resources/hudson/node_monitors/Messages_pt.properties +++ b/core/src/main/resources/hudson/node_monitors/Messages_pt.properties @@ -20,14 +20,14 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ClockMonitor.DisplayName=Diferença de tempo +ClockMonitor.DisplayName=Diferen\u00e7a de tempo ResponseTimeMonitor.TimeOut=Time out da tentativa {0} -AbstractNodeMonitorDescriptor.NoDataYet=Sem informação -TemporarySpaceMonitor.DisplayName=Espaço de área temporária -DiskSpaceMonitor.MarkedOnline=Colocar {0} online novamente se existir espaço em disco suficiente +AbstractNodeMonitorDescriptor.NoDataYet=Sem informa\u00e7\u00e3o +TemporarySpaceMonitor.DisplayName=Espa\u00e7o de \u00e1rea tempor\u00e1ria +DiskSpaceMonitor.MarkedOnline=Colocar {0} online novamente se existir espa\u00e7o em disco suficiente ResponseTimeMonitor.DisplayName=Tempo de resposta -DiskSpaceMonitor.MarkedOffline=Deixar {0} temporariamente offline devido à falta de espaço em disco -DiskSpaceMonitor.DisplayName=Espaço em disco livre -SwapSpaceMonitor.DisplayName=Espaço de swap livre +DiskSpaceMonitor.MarkedOffline=Deixar {0} temporariamente offline devido \u00e0 falta de espa\u00e7o em disco +DiskSpaceMonitor.DisplayName=Espa\u00e7o em disco livre +SwapSpaceMonitor.DisplayName=Espa\u00e7o de swap livre ArchitectureMonitor.DisplayName=Arquitetura -ResponseTimeMonitor.MarkedOffline=Deixar {0} offline porque não está respondendo +ResponseTimeMonitor.MarkedOffline=Deixar {0} offline porque n\u00e3o est\u00e1 respondendo diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt.properties index bb297f44b5..e6c3c92bd9 100644 --- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt.properties +++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt.properties @@ -21,7 +21,7 @@ # THE SOFTWARE. Dismiss=Dispensar -blurb=O Jenkins deixou alguns slaves offlineporque a href="{0}/computer/">suas métricas estavam abaixo do limite. \ - Se você não quiser que o Jenkins faça isso, \ - mude a configuração. +blurb=O Jenkins deixou alguns slaves offlineporque a href="{0}/computer/">suas m\u00e9tricas estavam abaixo do limite. \ + Se voc\u00ea n\u00e3o quiser que o Jenkins fa\u00e7a isso, \ + mude a configura\u00e7\u00e3o. diff --git a/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause_pt.properties b/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause_pt.properties index 70ffc5b489..fffde62f1a 100644 --- a/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause_pt.properties +++ b/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause_pt.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Ping\ response\ time\ is\ too\ long\ or\ timed\ out.=O tempo de resposta do ping está muito alto ou deu time out +Ping\ response\ time\ is\ too\ long\ or\ timed\ out.=O tempo de resposta do ping est\u00e1 muito alto ou deu time out diff --git a/core/src/main/resources/hudson/scm/EmptyChangeLogSet/digest_pt.properties b/core/src/main/resources/hudson/scm/EmptyChangeLogSet/digest_pt.properties index 4692c8a221..57832d1c49 100644 --- a/core/src/main/resources/hudson/scm/EmptyChangeLogSet/digest_pt.properties +++ b/core/src/main/resources/hudson/scm/EmptyChangeLogSet/digest_pt.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -No\ changes.=Sem mudanças. +No\ changes.=Sem mudan\u00e7as. diff --git a/core/src/main/resources/hudson/scm/Messages_pt.properties b/core/src/main/resources/hudson/scm/Messages_pt.properties index 41e2e32f98..ea6081b823 100644 --- a/core/src/main/resources/hudson/scm/Messages_pt.properties +++ b/core/src/main/resources/hudson/scm/Messages_pt.properties @@ -21,5 +21,6 @@ # THE SOFTWARE. SCM.Permissions.Title=SCM -SCM.TagPermission.Description=Essa permissão deixa usuários criar uma nova tag no repositório do código fonte para um determinado build. +SCM.TagPermission.Description=Essa permiss\u00e3o deixa usu\u00e1rios criar uma nova tag no reposit\u00f3rio do c\u00f3digo fonte para um determinado build. NullSCM.DisplayName=Nenhum + diff --git a/core/src/main/resources/hudson/scm/SCM/project-changes_pt.properties b/core/src/main/resources/hudson/scm/SCM/project-changes_pt.properties index 149f6c1189..b36db66c29 100644 --- a/core/src/main/resources/hudson/scm/SCM/project-changes_pt.properties +++ b/core/src/main/resources/hudson/scm/SCM/project-changes_pt.properties @@ -21,5 +21,5 @@ # THE SOFTWARE. No\ builds.=Sem builds. -No\ changes\ in\ any\ of\ the\ builds.=Sem mudanças em nenhum dos builds. +No\ changes\ in\ any\ of\ the\ builds.=Sem mudan\u00e7as em nenhum dos builds. detail=detalhe diff --git a/core/src/main/resources/hudson/search/Messages_pt.properties b/core/src/main/resources/hudson/search/Messages_pt.properties index a5181b0b41..1e7c8e35b4 100644 --- a/core/src/main/resources/hudson/search/Messages_pt.properties +++ b/core/src/main/resources/hudson/search/Messages_pt.properties @@ -20,4 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -UserSearchProperty.DisplayName=Definição para pesquisa +UserSearchProperty.DisplayName=Defini\u00e7\u00e3o para pesquisa + diff --git a/core/src/main/resources/hudson/search/Search/search-failed_pt.properties b/core/src/main/resources/hudson/search/Search/search-failed_pt.properties index 5208ca74f6..47f147878d 100644 --- a/core/src/main/resources/hudson/search/Search/search-failed_pt.properties +++ b/core/src/main/resources/hudson/search/Search/search-failed_pt.properties @@ -20,5 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Nothing\ seems\ to\ match.=Não foi encontrado nenhum correspondente. +Nothing\ seems\ to\ match.=N\u00e3o foi encontrado nenhum correspondente. Search\ for=Buscar por + diff --git a/core/src/main/resources/hudson/search/UserSearchProperty/config_pt.properties b/core/src/main/resources/hudson/search/UserSearchProperty/config_pt.properties index 7a2de4eb93..8aa1843a89 100644 --- a/core/src/main/resources/hudson/search/UserSearchProperty/config_pt.properties +++ b/core/src/main/resources/hudson/search/UserSearchProperty/config_pt.properties @@ -20,5 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Case-sensitivity=Diferenciar maiúsculas/minúsculas -Insensitive\ search\ tool=Busca sem diferenciar maiúsculas/minúsculas +Case-sensitivity=Diferenciar mai\u00fasculas/min\u00fasculas +Insensitive\ search\ tool=Busca sem diferenciar mai\u00fasculas/min\u00fasculas + + diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entry_pt.properties b/core/src/main/resources/hudson/widgets/HistoryWidget/entry_pt.properties index 8db8880a7b..678eb90bc3 100644 --- a/core/src/main/resources/hudson/widgets/HistoryWidget/entry_pt.properties +++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entry_pt.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Console\ Output=Saída do console +Console\ Output=Sa\u00edda do console diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index_pt.properties b/core/src/main/resources/hudson/widgets/HistoryWidget/index_pt.properties index 7cce25757f..c4378800f7 100644 --- a/core/src/main/resources/hudson/widgets/HistoryWidget/index_pt.properties +++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index_pt.properties @@ -23,4 +23,4 @@ for\ failures=para falhas for\ all=para todos More\ ...=Mais ... -trend=tendência +trend=tend\u00eancia diff --git a/core/src/main/resources/hudson/widgets/Messages_pt.properties b/core/src/main/resources/hudson/widgets/Messages_pt.properties index 2c4259df57..28c12563fa 100644 --- a/core/src/main/resources/hudson/widgets/Messages_pt.properties +++ b/core/src/main/resources/hudson/widgets/Messages_pt.properties @@ -20,4 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -BuildHistoryWidget.DisplayName=Histórico de builds +BuildHistoryWidget.DisplayName=Hist\u00f3rico de builds + -- GitLab From 84843f25d4835f75728625a7f9536c4a652c568f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20K=C3=BChnen=20Meneguello?= Date: Sat, 21 Dec 2013 18:19:06 -0200 Subject: [PATCH 0647/1630] Various translation fixes --- .../hudson/tasks/test/Messages_pt_BR.properties | 12 ++++++------ .../views/BuildButtonColumn/column_pt_BR.properties | 5 ++++- .../resources/hudson/views/Messages_pt_BR.properties | 11 +++++++++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/core/src/main/resources/hudson/tasks/test/Messages_pt_BR.properties b/core/src/main/resources/hudson/tasks/test/Messages_pt_BR.properties index 46448cba81..dc1ee682e7 100644 --- a/core/src/main/resources/hudson/tasks/test/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/test/Messages_pt_BR.properties @@ -29,14 +29,14 @@ AggregatedTestResultPublisher.DisplayName=Agrega o resultado dos testes com proj # Aggregated Test Result AggregatedTestResultPublisher.Title=Agrega o resultado dos testes # {0} {0,choice,0#tests|1#test|1 Date: Mon, 6 Jan 2014 09:20:31 -0800 Subject: [PATCH 0648/1630] [maven-release-plugin] prepare release jenkins-1.546 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- plugins/pom.xml | 8 ++++---- pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 99efb2d72a..c3b4b5822a 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.546-SNAPSHOT + 1.546 cli diff --git a/core/pom.xml b/core/pom.xml index 0bb91ab4da..01253fdfc7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.546-SNAPSHOT + 1.546 ../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 51f0dfa01f..5809a2c834 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -11,7 +11,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.546-SNAPSHOT + 1.546 pom +

          What's new in 1.546 (2014/01/06)

          • Builds disappear after renaming a job. @@ -76,7 +79,6 @@ Upcoming changes When clicking Apply results in an exception (error page), show it, rather than creating an empty dialog. (issue 20772)
          -

          What's new in 1.545 (2013/12/31)

          • -- GitLab From 6763eb88e87638a05f699152937ff6ba44a8aef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20K=C3=BChnen=20Meneguello?= Date: Mon, 6 Jan 2014 16:00:59 -0200 Subject: [PATCH 0651/1630] [FIXED JENKINS-21239] Trend Graph NPE when no builds --- core/src/main/java/hudson/model/Job.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 902e0fbdf5..2e3ed8a7a8 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -1216,7 +1216,7 @@ public abstract class Job, RunT extends Run { @@ -1350,6 +1350,16 @@ public abstract class Job, RunT extends Run Date: Mon, 6 Jan 2014 22:06:10 +0100 Subject: [PATCH 0652/1630] Changelog record for PR #1084 --- changelog.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.html b/changelog.html index 557f56d6f4..15cbd9e0b4 100644 --- a/changelog.html +++ b/changelog.html @@ -58,6 +58,9 @@ Upcoming changes
          • NPE since 1.545 when using aggregated test result publisher without specifying downstream jobs explicitly. (issue 18410) +
          • + Fixed Trend Graph NPE when there isn't any builds + (issue 21239)
          -- GitLab From 36c36a6ca421f69ba63448dc3f657d244b078e80 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 6 Jan 2014 19:28:41 -0800 Subject: [PATCH 0653/1630] updated changelog as a part of the release --- debian/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/debian/changelog b/debian/debian/changelog index 170dbbd7c5..ff9be9ce74 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +jenkins (1.546) unstable; urgency=low + + * See http://jenkins-ci.org/changelog for more details. + + -- Kohsuke Kawaguchi Mon, 06 Jan 2014 09:45:19 -0800 + jenkins (1.545) unstable; urgency=low * See http://jenkins-ci.org/changelog for more details. -- GitLab From f4314d4430795c91091d07b00a576f458fde4db2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 6 Jan 2014 19:31:32 -0800 Subject: [PATCH 0654/1630] creating an RC branch --- changelog.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index 9279371246..aa1dcd8972 100644 --- a/changelog.html +++ b/changelog.html @@ -54,6 +54,14 @@ Upcoming changes + + + - - -

          What's new in 1.546 (2014/01/06)

            -- GitLab From 67f3465e03780db0c995ac5b4858cae2cafec3b1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 6 Jan 2014 19:31:42 -0800 Subject: [PATCH 0655/1630] the trunk is toward 1.548-SNAPSHOT --- cli/pom.xml | 2 +- core/pom.xml | 2 +- plugins/pom.xml | 8 ++++---- pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 8d6988b739..155d421ecd 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.547-SNAPSHOT + 1.548-SNAPSHOT cli diff --git a/core/pom.xml b/core/pom.xml index 7b664fba0c..ee0a686c99 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.547-SNAPSHOT + 1.548-SNAPSHOT ../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index fa841fa7a1..8242200454 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -11,7 +11,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.547-SNAPSHOT + 1.548-SNAPSHOT pom org.kohsuke.stapler maven-stapler-plugin - + ${maven-stapler-plugin.version} /lib/.* -- GitLab From 7c91c402a7c491d51f776178898ee473989ab6c9 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 7 Jan 2014 10:10:27 -0500 Subject: [PATCH 0657/1630] [FIXED JENKINS-21254] Ensuring that all s offered on the /login page can be read even by anonymous users without Jenkins.READ. --- changelog.html | 4 +- .../main/resources/lib/layout/layout.jelly | 4 +- .../org/jvnet/hudson/test/JenkinsRule.java | 28 +++++++--- test/src/test/java/lib/layout/LayoutTest.java | 55 +++++++++++++++++++ 4 files changed, 82 insertions(+), 9 deletions(-) create mode 100644 test/src/test/java/lib/layout/LayoutTest.java diff --git a/changelog.html b/changelog.html index aa1dcd8972..38e589671a 100644 --- a/changelog.html +++ b/changelog.html @@ -55,7 +55,9 @@ Upcoming changes diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index 95d73c8d01..0368fddd4b 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -132,7 +132,9 @@ ${h.initPageVariables(context)} - + + + diff --git a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java index 6070505df0..d74a44c9e9 100644 --- a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java +++ b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java @@ -30,6 +30,7 @@ import com.gargoylesoftware.htmlunit.DefaultCssErrorHandler; import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequestSettings; +import com.gargoylesoftware.htmlunit.WebResponse; import com.gargoylesoftware.htmlunit.html.DomNode; import com.gargoylesoftware.htmlunit.html.HtmlButton; import com.gargoylesoftware.htmlunit.html.HtmlElement; @@ -206,6 +207,7 @@ import java.util.logging.Filter; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; +import javax.annotation.CheckForNull; import jenkins.model.JenkinsLocationConfiguration; @@ -250,11 +252,12 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction { protected Server server; /** - * Where in the {@link Server} is Hudson deployed? + * Where in the {@link Server} is Jenkins deployed? *

            * Just like {@link javax.servlet.ServletContext#getContextPath()}, starts with '/' but doesn't end with '/'. + * Unlike {@link WebClient#getContextPath} this is not a complete URL. */ - protected String contextPath = "/jenkins"; + public String contextPath = "/jenkins"; /** * {@link Runnable}s to be invoked at {@link #after()} . @@ -1913,10 +1916,10 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction { } /** - * Requests a page within Hudson. + * Requests an HTML page within Jenkins. * * @param relative - * Relative path within Hudson. Starts without '/'. + * Relative path within Jenkins. Starts without '/'. * For example, "job/test/" to go to a job top page. */ public HtmlPage goTo(String relative) throws IOException, SAXException { @@ -1928,14 +1931,24 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction { } } - public Page goTo(String relative, String expectedContentType) throws IOException, SAXException { + /** + * Requests a page within Jenkins. + * + * @param relative + * Relative path within Jenkins. Starts without '/'. + * For example, "job/test/" to go to a job top page. + * @param expectedContentType the expected {@link WebResponse#getContentType}, or null to do no such check + */ + public Page goTo(String relative, @CheckForNull String expectedContentType) throws IOException, SAXException { assert !relative.startsWith("/"); Page p = super.getPage(getContextPath() + relative); - assertThat(p.getWebResponse().getContentType(), is(expectedContentType)); + if (expectedContentType != null) { + assertThat(p.getWebResponse().getContentType(), is(expectedContentType)); + } return p; } - /** Loads a page as XML. Useful for testing Hudson's xml api, in concert with + /** Loads a page as XML. Useful for testing Jenkins's XML API, in concert with * assertXPath(DomNode page, String xpath) * @param path the path part of the url to visit * @return the XmlPage found at that url @@ -1968,6 +1981,7 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction { /** * Returns the URL of the webapp top page. * URL ends with '/'. + *

            This is actually the same as {@link #getURL} and should not be confused with {@link #contextPath}. */ public String getContextPath() throws IOException { return getURL().toExternalForm(); diff --git a/test/src/test/java/lib/layout/LayoutTest.java b/test/src/test/java/lib/layout/LayoutTest.java new file mode 100644 index 0000000000..a632b18cce --- /dev/null +++ b/test/src/test/java/lib/layout/LayoutTest.java @@ -0,0 +1,55 @@ +/* + * The MIT License + * + * Copyright 2014 Jesse Glick. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package lib.layout; + +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlLink; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Bug; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.recipes.PresetData; + +public class LayoutTest { + + @Rule public JenkinsRule r = new JenkinsRule(); + + @Bug(21254) + @PresetData(PresetData.DataSet.NO_ANONYMOUS_READACCESS) + @Test public void rejectedLinks() throws Exception { + JenkinsRule.WebClient wc = r.createWebClient(); + String prefix = r.contextPath + '/'; + for (HtmlElement e : wc.goTo("login").getElementsByTagName("link")) { + String href = ((HtmlLink) e).getHrefAttribute(); + if (!href.startsWith(prefix)) { + System.err.println("ignoring " + href); + continue; + } + System.err.println("checking " + href); + wc.goTo(href.substring(prefix.length()), null); + } + } + +} -- GitLab From dda099c19a7a015d9c2fc655754dbb07b1b39455 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 7 Jan 2014 13:41:09 -0500 Subject: [PATCH 0658/1630] =?UTF-8?q?[FIXED=20JENKINS-19826]=20element.set?= =?UTF-8?q?Attribute('name',=20=E2=80=A6)=20does=20not=20work=20in=20IE=20?= =?UTF-8?q?in=20compatibility=20mode,=20so=20use=20prototype=E2=80=99s=20E?= =?UTF-8?q?lement(=E2=80=A6)=20which=20does.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.html | 3 +++ core/src/main/resources/lib/form/apply/apply.js | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/changelog.html b/changelog.html index 38e589671a..cc7cfbef5b 100644 --- a/changelog.html +++ b/changelog.html @@ -55,6 +55,9 @@ Upcoming changes

            \ No newline at end of file diff --git a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_de.properties b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_de.properties index edd282d640..bbd98cb35a 100644 --- a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_de.properties +++ b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv_de.properties @@ -1,6 +1,7 @@ BUILD_NUMBER.blurb=Die aktuelle Build-Nummer, z.B. "153". BUILD_ID.blurb=Die aktuelle Build-ID, z.B. "2005-08-22_23-59-59" (YYYY-MM-DD_hh-mm-ss). -JOB_NAME.blurb=Projektname des Builds, z.B. "foo". +BUILD_DISPLAY_NAME.blurb=Der Anzeigename des aktuellen Builds, standardmig z.B. "#153". +JOB_NAME.blurb=Projektname des Builds, z.B. "foo" oder "foo/bar". (Um in einem Bourne Shell-Script den Pfadanteil abzuschneiden, probieren Sie: $'{'JOB_NAME##*/}) BUILD_TAG.blurb=Eine Zeichenkette in der Form "jenkins-$'{'JOB_NAME}-$'{'BUILD_NUMBER}". \ Diese Variable l\u00E4\u00DFt sich sehr bequem zur sp\u00E4teren Identifikation in eine \ Resource-Datei, JAR-Datei usw. ablegen. @@ -12,7 +13,7 @@ EXECUTOR_NUMBER.blurb=Die laufende Nummer des Build-Prozessors, der den aktuelle NODE_NAME.blurb=Name des Build-Slaves, wenn auf einem Build-Slave gebaut wird, oder "master" wenn auf dem Master-Server gebaut wird. NODE_LABELS.blurb=Durch Leerzeichen getrennte Liste von Labels, die dem Knoten zugeordnet sind. WORKSPACE.blurb=Der absolute Pfad zum Arbeitsbereich. -JENKINS_HOME.blurb= +JENKINS_HOME.blurb=Der absolute Pfad des Verzeichnisses, in dem der Master-Server seine Daten speichert. JENKINS_URL.blurb=Die absolute URL der Jenkins-Instanz, z.B. http://server:port/jenkins/. BUILD_URL.blurb=Die absolute URL dieses Builds, z.B. http://server:port/jenkins/job/foo/15/. JOB_URL.blurb=Die absolute URL dieses Jobs, z.B. http://server:port/jenkins/job/foo/. diff --git a/core/src/main/resources/jenkins/model/Jenkins/newView_de.properties b/core/src/main/resources/jenkins/model/Jenkins/newView_de.properties index 8234511479..90cdc73615 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/newView_de.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/newView_de.properties @@ -20,4 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. +New\ View=Neue Ansicht View\ name=Ansichtsname +Copy\ Existing\ View=Bestehende Ansicht kopieren -- GitLab From c8930ed1b8d6b2dfa3dc7692f165ff9d9a2ff95a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= Date: Sun, 12 Jan 2014 18:04:05 +0100 Subject: [PATCH 0678/1630] Refactor #992 --- test/src/test/java/hudson/model/ViewTest.java | 164 ++++++++++-------- 1 file changed, 88 insertions(+), 76 deletions(-) diff --git a/test/src/test/java/hudson/model/ViewTest.java b/test/src/test/java/hudson/model/ViewTest.java index 90f9a80f67..69806cd419 100644 --- a/test/src/test/java/hudson/model/ViewTest.java +++ b/test/src/test/java/hudson/model/ViewTest.java @@ -37,6 +37,8 @@ import hudson.XmlFile; import hudson.matrix.AxisList; import hudson.matrix.LabelAxis; import hudson.matrix.MatrixProject; +import hudson.model.Queue.Task; + import org.jvnet.hudson.test.Email; import org.w3c.dom.Text; @@ -104,8 +106,7 @@ public class ViewTest { Text viewLabel = (Text) privateViewsPage.getFirstByXPath("//table[@id='viewList']//td[@class='active']/text()"); assertTrue("'All' view should be selected", viewLabel.getTextContent().contains(Hudson_ViewName())); - View listView = new ListView("listView", j.jenkins); - j.jenkins.addView(listView); + View listView = listView("listView"); HtmlPage newViewPage = wc.goTo("user/me/my-views/newView"); HtmlForm form = newViewPage.getFormByName("createItem"); @@ -126,8 +127,7 @@ public class ViewTest { @Test public void deleteView() throws Exception { WebClient wc = j.createWebClient(); - ListView v = new ListView("list", j.jenkins); - j.jenkins.addView(v); + ListView v = listView("list"); HtmlPage delete = wc.getPage(v, "delete"); j.submit(delete.getFormByName("delete")); assertNull(j.jenkins.getView("list")); @@ -144,8 +144,7 @@ public class ViewTest { @Bug(9367) @Test public void persistence() throws Exception { - ListView view = new ListView("foo", j.jenkins); - j.jenkins.addView(view); + ListView view = listView("foo"); ListView v = (ListView) Jenkins.XSTREAM.fromXML(Jenkins.XSTREAM.toXML(view)); System.out.println(v.getProperties()); @@ -189,9 +188,8 @@ public class ViewTest { @Bug(17302) @Test public void doConfigDotXml() throws Exception { - ListView view = new ListView("v", j.jenkins); + ListView view = listView("v"); view.description = "one"; - j.jenkins.addView(view); WebClient wc = j.createWebClient(); String xml = wc.goToXml("view/v/config.xml").getContent(); assertTrue(xml, xml.contains("one")); @@ -206,46 +204,63 @@ public class ViewTest { @Test public void testGetQueueItems() throws IOException, Exception{ - ListView view = new ListView("foo", j.jenkins); - ListView view2 =new ListView("foo2", j.jenkins); - j.jenkins.addView(view); - j.jenkins.addView(view2); - FreeStyleProject job1 = j.jenkins.createProject(FreeStyleProject.class, "free"); - MatrixProject job2 = j.jenkins.createProject(MatrixProject.class, "matrix"); - FreeStyleProject job = j.jenkins.createProject(FreeStyleProject.class, "not-in-view"); - FreeStyleProject job3 = j.jenkins.createProject(FreeStyleProject.class, "in-other-view"); - view.filterQueue=true; - view.jobNames.add(job1.getDisplayName()); - view.jobNames.add(job2.getDisplayName()); - view2.filterQueue=true; - view2.jobNames.add(job3.getDisplayName()); - job1.setAssignedLabel(j.jenkins.getLabelAtom("without-any-slave")); - job2.setAssignedLabel(j.jenkins.getLabelAtom("without-any-slave")); - job.setAssignedLabel(j.jenkins.getLabelAtom("without-any-slave")); - job3.setAssignedLabel(j.jenkins.getLabelAtom("without-any-slave")); - Queue.Item item = Queue.getInstance().schedule(job, 0); - Queue.Item item1 = Queue.getInstance().schedule(job1, 0); - Queue.Item item2 = Queue.getInstance().schedule(job2, 0); - Queue.Item item3 = Queue.getInstance().schedule(job3, 0); + ListView view1 = listView("view1"); + view1.filterQueue = true; + ListView view2 = listView("view2"); + view2.filterQueue = true; + + FreeStyleProject inView1 = j.createFreeStyleProject("in-view1"); + inView1.setAssignedLabel(j.jenkins.getLabelAtom("without-any-slave")); + view1.add(inView1); + + MatrixProject inView2 = j.createMatrixProject("in-view2"); + inView2.setAssignedLabel(j.jenkins.getLabelAtom("without-any-slave")); + view2.add(inView2); + + FreeStyleProject notInView = j.createFreeStyleProject("not-in-view"); + notInView.setAssignedLabel(j.jenkins.getLabelAtom("without-any-slave")); + + FreeStyleProject inBothViews = j.createFreeStyleProject("in-both-views"); + inBothViews.setAssignedLabel(j.jenkins.getLabelAtom("without-any-slave")); + view1.add(inBothViews); + view2.add(inBothViews); + + Queue.getInstance().schedule(notInView, 0); + Queue.getInstance().schedule(inView1, 0); + Queue.getInstance().schedule(inView2, 0); + Queue.getInstance().schedule(inBothViews, 0); + Thread.sleep(1000); - assertTrue("Queued items for view " + view.getDisplayName() + " should contain job " + job1.getDisplayName(),view.getQueueItems().contains(Queue.getInstance().getItem(job1))); - assertTrue("Queued items for view " + view.getDisplayName() + " should contain job " + job2.getDisplayName(),view.getQueueItems().contains(Queue.getInstance().getItem(job2))); - assertTrue("Queued items for view " + view2.getDisplayName() + " should contain job " + job3.getDisplayName(),view2.getQueueItems().contains(Queue.getInstance().getItem(job3))); - assertFalse("Queued items for view " + view.getDisplayName() + " should not contain job " + job.getDisplayName(), view.getQueueItems().contains(Queue.getInstance().getItem(job))); - assertFalse("Queued items for view " + view.getDisplayName() + " should not contain job " + job3.getDisplayName(), view.getQueueItems().contains(Queue.getInstance().getItem(job3))); - assertFalse("Queued items for view " + view2.getDisplayName() + " should not contain job " + job.getDisplayName(), view2.getQueueItems().contains(Queue.getInstance().getItem(job))); - assertFalse("Queued items for view " + view2.getDisplayName() + " should not contain job " + job1.getDisplayName(), view2.getQueueItems().contains(Queue.getInstance().getItem(job1))); - assertFalse("Queued items for view " + view2.getDisplayName() + " should not contain job " + job2.getDisplayName(), view2.getQueueItems().contains(Queue.getInstance().getItem(job2))); + + assertContainsItems(view1, inView1, inBothViews); + assertNotContainsItems(view1, notInView, inView2); + assertContainsItems(view2, inView2, inBothViews); + assertNotContainsItems(view2, notInView, inView1); + } + + private void assertContainsItems(View view, Task... items) { + for (Task job: items) { + assertTrue( + "Queued items for " + view.getDisplayName() + " should contain " + job.getDisplayName(), + view.getQueueItems().contains(Queue.getInstance().getItem(job)) + ); + } + } + + private void assertNotContainsItems(View view, Task... items) { + for (Task job: items) { + assertFalse( + "Queued items for " + view.getDisplayName() + " should not contain " + job.getDisplayName(), + view.getQueueItems().contains(Queue.getInstance().getItem(job)) + ); + } } @Test public void testGetComputers() throws IOException, Exception{ - ListView view1 = new ListView("view1", j.jenkins); - ListView view2 = new ListView("view2", j.jenkins); - ListView view3 = new ListView("view3", j.jenkins); - j.jenkins.addView(view1); - j.jenkins.addView(view2); - j.jenkins.addView(view3); + ListView view1 = listView("view1"); + ListView view2 = listView("view2"); + ListView view3 = listView("view3"); view1.filterExecutors=true; view2.filterExecutors=true; view3.filterExecutors=true; @@ -256,49 +271,49 @@ public class ViewTest { Slave slave3 = j.createOnlineSlave(j.jenkins.getLabel("label0")); Slave slave4 = j.createOnlineSlave(j.jenkins.getLabel("label4")); - FreeStyleProject freestyleJob = j.jenkins.createProject(FreeStyleProject.class, "free"); + FreeStyleProject freestyleJob = j.createFreeStyleProject("free"); view1.add(freestyleJob); freestyleJob.setAssignedLabel(j.jenkins.getLabel("label0||label2")); - MatrixProject matrixJob = j.jenkins.createProject(MatrixProject.class, "matrix"); + MatrixProject matrixJob = j.createMatrixProject("matrix"); view1.add(matrixJob); matrixJob.setAxes(new AxisList( new LabelAxis("label", Arrays.asList("label1")) )); - FreeStyleProject noLabelJob = j.jenkins.createProject(FreeStyleProject.class, "not-assigned-label"); + FreeStyleProject noLabelJob = j.createFreeStyleProject("not-assigned-label"); view3.add(noLabelJob); noLabelJob.setAssignedLabel(null); - FreeStyleProject foreignJob = j.jenkins.createProject(FreeStyleProject.class, "in-other-view"); + FreeStyleProject foreignJob = j.createFreeStyleProject("in-other-view"); view2.add(foreignJob); foreignJob.setAssignedLabel(j.jenkins.getLabel("label0||label1")); // contains all slaves having labels associated with freestyleJob or matrixJob - assertContains(view1, slave0, slave1, slave2, slave3); - assertNotContains(view1, slave4); + assertContainsNodes(view1, slave0, slave1, slave2, slave3); + assertNotContainsNodes(view1, slave4); // contains all slaves having labels associated with foreignJob - assertContains(view2, slave0, slave1, slave3); - assertNotContains(view2, slave2, slave4); + assertContainsNodes(view2, slave0, slave1, slave3); + assertNotContainsNodes(view2, slave2, slave4); // contains all slaves as it contains noLabelJob that can run everywhere - assertContains(view3, slave0, slave1, slave2, slave3, slave4); + assertContainsNodes(view3, slave0, slave1, slave2, slave3, slave4); } - private void assertContains(View view, Node... slaves) { + private void assertContainsNodes(View view, Node... slaves) { for (Node slave: slaves) { assertTrue( - "Filtered executors for view " + view.getDisplayName() + " should contain slave " + slave.getDisplayName(), + "Filtered executors for " + view.getDisplayName() + " should contain " + slave.getDisplayName(), view.getComputers().contains(slave.toComputer()) ); } } - private void assertNotContains(View view, Node... slaves) { + private void assertNotContainsNodes(View view, Node... slaves) { for (Node slave: slaves) { assertFalse( - "Filtered executors for view " + view.getDisplayName() + " should not contain slave " + slave.getDisplayName(), + "Filtered executors for " + view.getDisplayName() + " should not contain " + slave.getDisplayName(), view.getComputers().contains(slave.toComputer()) ); } @@ -306,11 +321,10 @@ public class ViewTest { @Test public void testGetItem() throws Exception{ - ListView view = new ListView("foo", j.jenkins); - j.jenkins.addView(view); - FreeStyleProject job1 = j.jenkins.createProject(FreeStyleProject.class, "free"); - MatrixProject job2 = j.jenkins.createProject(MatrixProject.class, "matrix"); - FreeStyleProject job3 = j.jenkins.createProject(FreeStyleProject.class, "not-included"); + ListView view = listView("foo"); + FreeStyleProject job1 = j.createFreeStyleProject("free"); + MatrixProject job2 = j.createMatrixProject("matrix"); + FreeStyleProject job3 = j.createFreeStyleProject("not-included"); view.jobNames.add(job2.getDisplayName()); view.jobNames.add(job1.getDisplayName()); assertEquals("View should return job " + job1.getDisplayName(),job1, view.getItem("free")); @@ -319,12 +333,10 @@ public class ViewTest { @Test public void testRename() throws Exception { - ListView view = new ListView("foo", j.jenkins); - j.jenkins.addView(view); + ListView view = listView("foo"); view.rename("renamed"); assertEquals("View should have name foo.", "renamed", view.getDisplayName()); - ListView view2 = new ListView("foo", j.jenkins); - j.jenkins.addView(view); + ListView view2 = listView("foo"); try{ view2.rename("renamed"); fail("Attemt to rename job with a name used by another view with the same owner should throw exception"); @@ -336,24 +348,21 @@ public class ViewTest { @Test public void testGetOwnerItemGroup() throws Exception { - ListView view = new ListView("foo", j.jenkins); - j.jenkins.addView(view); + ListView view = listView("foo"); assertEquals("View should have owner jenkins.",j.jenkins.getItemGroup(), view.getOwnerItemGroup()); } @Test public void testGetOwnerPrimaryView() throws Exception{ - ListView view = new ListView("foo", j.jenkins); - j.jenkins.addView(view); + ListView view = listView("foo"); j.jenkins.setPrimaryView(view); assertEquals("View should have primary view " + view.getDisplayName(),view, view.getOwnerPrimaryView()); } @Test public void testSave() throws Exception{ - ListView view = new ListView("foo", j.jenkins); - j.jenkins.addView(view); - FreeStyleProject job = j.jenkins.createProject(FreeStyleProject.class, "free"); + ListView view = listView("foo"); + FreeStyleProject job = j.createFreeStyleProject("free"); view.jobNames.add("free"); view.save(); j.jenkins.doReload(); @@ -366,8 +375,7 @@ public class ViewTest { @Test public void testGetProperties() throws Exception { - View view = new ListView("foo", j.jenkins); - j.jenkins.addView(view); + View view = listView("foo"); Thread.sleep(100000); HtmlForm f = j.createWebClient().getPage(view, "configure").getFormByName("viewConfig"); ((HtmlLabel)f.selectSingleNode(".//LABEL[text()='Test property']")).click(); @@ -375,6 +383,12 @@ public class ViewTest { assertNotNull("View should contains ViewPropertyImpl property.", view.getProperties().get(PropertyImpl.class)); } + private ListView listView(String name) throws IOException { + ListView view = new ListView(name, j.jenkins); + j.jenkins.addView(view); + return view; + } + public static class PropertyImpl extends ViewProperty { public String name; @@ -391,6 +405,4 @@ public class ViewTest { } } } - - } -- GitLab From 9df61499fe1c74511ec2a014a308567f25f67f67 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 12 Jan 2014 19:45:33 -0800 Subject: [PATCH 0679/1630] [maven-release-plugin] prepare release jenkins-1.547 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- plugins/pom.xml | 8 ++++---- pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 8d6988b739..21801f17bc 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.547-SNAPSHOT + 1.547 cli diff --git a/core/pom.xml b/core/pom.xml index 7b664fba0c..a03d01ac43 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.547-SNAPSHOT + 1.547 ../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index fa841fa7a1..02fb1e8a52 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -11,7 +11,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.547-SNAPSHOT + 1.547 pom +

            What's new in 1.547 (2014/01/12)

            • NPE since 1.545 when using aggregated test result publisher without specifying downstream jobs explicitly. @@ -70,7 +73,6 @@ Upcoming changes Fixed Trend Graph NPE when there isn't any builds (issue 21239)
            -

            What's new in 1.546 (2014/01/06)

            • -- GitLab From f9aaeee402a813ec393f403a85d92b4ea9980684 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 13 Jan 2014 10:40:27 -0500 Subject: [PATCH 0682/1630] Update annotation-indexer to 1.7 so we can use @Restricted on constructors. --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index b6812db773..8b6faa2af9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -194,7 +194,7 @@ THE SOFTWARE. org.jenkins-ci annotation-indexer - 1.6 + 1.7 org.jenkins-ci -- GitLab From e7d026a8e892368483b27c1f0ec76c971f6b14ce Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 13 Jan 2014 08:08:14 -0800 Subject: [PATCH 0683/1630] updated changelog as a part of the release --- debian/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/debian/changelog b/debian/debian/changelog index ff9be9ce74..cf7e601e8b 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +jenkins (1.547) unstable; urgency=low + + * See http://jenkins-ci.org/changelog for more details. + + -- Kohsuke Kawaguchi Sun, 12 Jan 2014 20:15:05 -0800 + jenkins (1.546) unstable; urgency=low * See http://jenkins-ci.org/changelog for more details. -- GitLab From 3d049bd384762d9872c10c016705795c84720830 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 13 Jan 2014 08:09:39 -0800 Subject: [PATCH 0684/1630] creating an RC branch --- changelog.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index a3f0168215..badbb29d1e 100644 --- a/changelog.html +++ b/changelog.html @@ -54,6 +54,14 @@ Upcoming changes + + + - - -

              What's new in 1.547 (2014/01/12)

                -- GitLab From 862bb2017dc6a1b56da01923b7a144e061e242ca Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 13 Jan 2014 08:09:50 -0800 Subject: [PATCH 0685/1630] the trunk is toward 1.549-SNAPSHOT --- cli/pom.xml | 2 +- core/pom.xml | 2 +- plugins/pom.xml | 8 ++++---- pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 155d421ecd..3430165054 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.548-SNAPSHOT + 1.549-SNAPSHOT cli diff --git a/core/pom.xml b/core/pom.xml index b6812db773..035b83a11e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.548-SNAPSHOT + 1.549-SNAPSHOT ../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 8242200454..4ed0c6ad1c 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -11,7 +11,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.548-SNAPSHOT + 1.549-SNAPSHOT pom -- GitLab From 84318cc97d024447d17a411f85ca1acd93a3425d Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 15 Jan 2014 13:55:59 -0500 Subject: [PATCH 0691/1630] =?UTF-8?q?Replaced=20=E2=80=9CNew=20Job?= =?UTF-8?q?=E2=80=9D=20with=20=E2=80=9CNew=20Item=E2=80=9D=20since=20vario?= =?UTF-8?q?us=20plugins=20(such=20as=20cloudbees-folder)=20add=20TopLevelI?= =?UTF-8?q?temDescriptor=E2=80=99s=20which=20do=20not=20produce=20Job?= =?UTF-8?q?=E2=80=99s.=20(Might=20be=20feasible=20to=20automatically=20use?= =?UTF-8?q?=20=E2=80=9CJob=E2=80=9D=20or=20=E2=80=9CItem=E2=80=9D=20accord?= =?UTF-8?q?ing=20to=20the=20most=20specific=20common=20supertype=20of=20al?= =?UTF-8?q?l=20registered=20descriptors=3F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/resources/hudson/model/Messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties index a10569766b..6eedd8d1b1 100644 --- a/core/src/main/resources/hudson/model/Messages.properties +++ b/core/src/main/resources/hudson/model/Messages.properties @@ -29,7 +29,7 @@ AbstractBuild.BuildingInWorkspace=\ in workspace {0} AbstractBuild.KeptBecause=This build is kept because of {0}. AbstractItem.NoSuchJobExists=No such job \u2018{0}\u2019 exists. Perhaps you meant \u2018{1}\u2019? -AbstractItem.Pronoun=Job +AbstractItem.Pronoun=Item AbstractProject.AssignedLabelString_NoMatch_DidYouMean=There\u2019s no slave/cloud that matches this assignment. Did you mean \u2018{1}\u2019 instead of \u2018{0}\u2019? AbstractProject.NewBuildForWorkspace=Scheduling a new build to get a workspace. AbstractProject.AwaitingBuildForWorkspace=Awaiting build to get a workspace. -- GitLab From 1b24e6289f7eacdc8338c944f546d3e74cc79df0 Mon Sep 17 00:00:00 2001 From: Jens Brejner Date: Wed, 15 Jan 2014 21:33:21 +0100 Subject: [PATCH 0692/1630] [FIXED JENKINS-21394] Avoid irrelevant job queing while node is offline --- .../java/hudson/model/AbstractProject.java | 46 ++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 5e8b7277a6..786305882a 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1546,6 +1546,14 @@ public abstract class AbstractProject

                ,R extends A return NO_CHANGES; } + // Do not trigger build, if no suitable slave is online + if (workspaceOfflineReason.equals(WorkspaceOfflineReason.all_suitable_nodes_are_offline)) { + // No suitable executor is online + listener.getLogger().print(Messages.AbstractProject_AwaitingWorkspaceToComeOnline(running/1000)); + listener.getLogger().println( " (" + workspaceOfflineReason.name() + ")"); + return NO_CHANGES; + } + Label label = getAssignedLabel(); if (label != null && label.isSelfLabel()) { // if the build is fixed on a node, then attempting a build will do us @@ -1610,7 +1618,43 @@ public abstract class AbstractProject

                ,R extends A enum WorkspaceOfflineReason { nonexisting_workspace, builton_node_gone, - builton_node_no_executors + builton_node_no_executors, + all_suitable_nodes_are_offline + } + + /** + * Returns true if all suitable nodes for the job are offline. + * + */ + + private boolean isAllSuitableNodesOffline(R build) { + Label label = getAssignedLabel(); + List allNodes = Jenkins.getInstance().getNodes(); + + + if (allNodes.isEmpty() && !(label == Jenkins.getInstance().getSelfLabel())) { + // no master/slave. pointless to talk about nodes + label = null; + } + + if (label != null) { + // Set nodes = label.getNodes(); + if (label.isOffline()) { + return true; + } else { + return false; + } + } else { + if (canRoam) { + for (Node n : Jenkins.getInstance().getNodes()) { + Computer c = n.toComputer(); + if (c != null && (c.isOnline() || c.isConnecting()) && c.isAcceptingTasks()) + // Some executor is ready and this job can run anywhere + return false; + } + } + } + return true; } private WorkspaceOfflineReason workspaceOffline(R build) throws IOException, InterruptedException { -- GitLab From 5727f287e245dc991ba2300790e091eb74981d8b Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 16 Jan 2014 11:27:27 -0500 Subject: [PATCH 0693/1630] Warn in the UI about short cycles in the day of month field for a crontab, which can have surprising behaviors near the end of a month. --- core/src/main/java/hudson/scheduler/CronTab.java | 10 ++++++++++ .../resources/hudson/scheduler/Messages.properties | 1 + .../hudson/triggers/TimerTrigger/help-spec.html | 6 ++++++ core/src/test/java/hudson/scheduler/CronTabTest.java | 3 +++ 4 files changed, 20 insertions(+) diff --git a/core/src/main/java/hudson/scheduler/CronTab.java b/core/src/main/java/hudson/scheduler/CronTab.java index 14ad347a00..9a86ec1400 100644 --- a/core/src/main/java/hudson/scheduler/CronTab.java +++ b/core/src/main/java/hudson/scheduler/CronTab.java @@ -430,6 +430,16 @@ public final class CronTab { } } + int daysOfMonth = 0; + for (int i = 1; i < 31; i++) { + if (checkBits(bits[2], i)) { + daysOfMonth++; + } + } + if (daysOfMonth > 5 && daysOfMonth < 28) { // a bit arbitrary + return Messages.CronTab_short_cycles_in_the_day_of_month_field_w(); + } + String hashified = hashify(spec); if (hashified != null) { return Messages.CronTab_spread_load_evenly_by_using_rather_than_(hashified, spec); diff --git a/core/src/main/resources/hudson/scheduler/Messages.properties b/core/src/main/resources/hudson/scheduler/Messages.properties index 77e0c72174..72120c92f2 100644 --- a/core/src/main/resources/hudson/scheduler/Messages.properties +++ b/core/src/main/resources/hudson/scheduler/Messages.properties @@ -24,5 +24,6 @@ BaseParser.StartEndReversed=You mean {0}-{1}? BaseParser.MustBePositive=step must be positive, but found {0} BaseParser.OutOfRange={0} is an invalid value. Must be within {1} and {2} CronTab.do_you_really_mean_every_minute_when_you=Do you really mean "every minute" when you say "{0}"? Perhaps you meant "{1}" +CronTab.short_cycles_in_the_day_of_month_field_w=Short cycles in the day-of-month field will behave oddly near the end of a month CronTab.spread_load_evenly_by_using_rather_than_=Spread load evenly by using \u2018{0}\u2019 rather than \u2018{1}\u2019 CronTabList.InvalidInput=Invalid input: "{0}": {1} diff --git a/core/src/main/resources/hudson/triggers/TimerTrigger/help-spec.html b/core/src/main/resources/hudson/triggers/TimerTrigger/help-spec.html index 30dc64c227..4ce69c94b9 100644 --- a/core/src/main/resources/hudson/triggers/TimerTrigger/help-spec.html +++ b/core/src/main/resources/hudson/triggers/TimerTrigger/help-spec.html @@ -50,6 +50,12 @@ but it actually is a hash of the job name, not a random function, so that the value remains stable for any given project.

                +

                + Beware that for the day of month field, short cycles such as */3 or H/3 will not work consistently near the end of most months, due to variable month lengths. + For example, */3 will run on the 1st, 4th, …31st days of a long month, then again the next day of the next month. + Hashes are always chosen in the 1-28 range, so H/3 will produce a gap between runs of between 3 and 6 days at the end of a month. + (Longer cycles will also have inconsistent lengths but the effect may be relatively less noticeable.) +

                Empty lines and lines that start with # will be ignored as comments.

                diff --git a/core/src/test/java/hudson/scheduler/CronTabTest.java b/core/src/test/java/hudson/scheduler/CronTabTest.java index a282c39a7e..eb6bffbf98 100644 --- a/core/src/test/java/hudson/scheduler/CronTabTest.java +++ b/core/src/test/java/hudson/scheduler/CronTabTest.java @@ -193,6 +193,9 @@ public class CronTabTest { assertEquals(Messages.CronTab_spread_load_evenly_by_using_rather_than_("H 3 * * *", "0 3 * * *"), new CronTab("0 3 * * *").checkSanity()); assertEquals(Messages.CronTab_spread_load_evenly_by_using_rather_than_("H 22 * * 6", "00 22 * * 6"), new CronTab("00 22 * * 6").checkSanity()); assertEquals(null, new CronTab("H/15 * 1 1 *").checkSanity()); + assertEquals(null, new CronTab("0 3 H/15 * *").checkSanity()); + assertEquals(Messages.CronTab_short_cycles_in_the_day_of_month_field_w(), new CronTab("0 3 H/3 * *").checkSanity()); + assertEquals(Messages.CronTab_short_cycles_in_the_day_of_month_field_w(), new CronTab("0 3 */5 * *").checkSanity()); } /** -- GitLab From 0c9d7dbafe0724ad4582a09c64187cf5c6a4ec6a Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 17 Jan 2014 09:35:17 +1100 Subject: [PATCH 0694/1630] changelog entry for JENKINS-17526 --- changelog.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.html b/changelog.html index 0232f31f66..1da3264dfe 100644 --- a/changelog.html +++ b/changelog.html @@ -58,6 +58,10 @@ Upcoming changes

              • Files added to zip archive are closed properly. (issue 20345) +
              • + Broken CSS when reloading Jenkins after a time of inactivity + (issue 17526) +
              -- GitLab From 22f2238b23312a54e8e07d6100446d30bfc67d0a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 18 Jan 2014 16:04:05 -0800 Subject: [PATCH 0695/1630] [JENKINS-16417] My recommended fix in response to https://github.com/jenkinsci/jenkins/pull/1093. This does not eliminate nor exclude the need for more generic pluggability, but it would at least address the security concern. --- changelog.html | 3 +++ core/src/main/java/hudson/model/Run.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index 1da3264dfe..3bd3b2ae72 100644 --- a/changelog.html +++ b/changelog.html @@ -55,6 +55,9 @@ Upcoming changes

              What's new in 1.554 (2014/03/09)

              • -- GitLab From 192c915768a343e3c7bd02a149d11af06003876a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 17 Mar 2014 00:10:11 -0700 Subject: [PATCH 0985/1630] updated changelog as a part of the release --- debian/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/debian/changelog b/debian/debian/changelog index cb6812fdd2..8a93f93083 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +jenkins (1.555) unstable; urgency=low + + * See http://jenkins-ci.org/changelog for more details. + + -- Kohsuke Kawaguchi Sun, 16 Mar 2014 22:43:02 -0700 + jenkins (1.554) unstable; urgency=low * See http://jenkins-ci.org/changelog for more details. -- GitLab From 78760d5b6c1edf95d77053a672563eed38eed520 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 17 Mar 2014 06:40:16 -0700 Subject: [PATCH 0986/1630] creating an RC branch --- changelog.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index 2fddae956c..a43437a5be 100644 --- a/changelog.html +++ b/changelog.html @@ -54,6 +54,14 @@ Upcoming changes + + + - - -

                What's new in 1.555 (2014/03/16)

                  -- GitLab From db4f60303aad0d20272a8ff86fc3ef9fab10bfd2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 17 Mar 2014 06:40:21 -0700 Subject: [PATCH 0987/1630] the trunk is toward 1.557-SNAPSHOT --- cli/pom.xml | 2 +- core/pom.xml | 2 +- plugins/pom.xml | 8 ++++---- pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index e82d87c8d9..b888d7aaec 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.556-SNAPSHOT + 1.557-SNAPSHOT cli diff --git a/core/pom.xml b/core/pom.xml index 201605e6d4..1f49ef4c6e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.556-SNAPSHOT + 1.557-SNAPSHOT ../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 96de7845f2..eff68aacb3 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -11,7 +11,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.556-SNAPSHOT + 1.557-SNAPSHOT pom - + diff --git a/core/src/main/resources/jenkins/model/DownloadSettings/config.groovy b/core/src/main/resources/jenkins/model/DownloadSettings/config.groovy new file mode 100644 index 0000000000..9c8987f561 --- /dev/null +++ b/core/src/main/resources/jenkins/model/DownloadSettings/config.groovy @@ -0,0 +1,9 @@ +package jenkins.security.DownloadSettings + +def f = namespace(lib.FormTagLib) + +f.section(title: _("Download Preferences")) { + f.entry(title: _("Use Browser"), field: "useBrowser") { + f.checkbox() + } +} diff --git a/core/src/main/resources/jenkins/security/DownloadSettings/help-useBrowser.html b/core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser.html similarity index 100% rename from core/src/main/resources/jenkins/security/DownloadSettings/help-useBrowser.html rename to core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser.html diff --git a/core/src/main/resources/jenkins/security/DownloadSettings/config.groovy b/core/src/main/resources/jenkins/security/DownloadSettings/config.groovy deleted file mode 100644 index 90c81a0dab..0000000000 --- a/core/src/main/resources/jenkins/security/DownloadSettings/config.groovy +++ /dev/null @@ -1,14 +0,0 @@ -package jenkins.security.DownloadSettings - -def f = namespace(lib.FormTagLib) - -f.section(title: _("Download Preferences")) { - f.entry(title: _("Use Browser"), field: "useBrowser") { - f.checkbox() - } - if (!instance.checkSignature || !hudson.model.DownloadService.signatureCheck) { // do not display this option by default - f.entry(title: _("Check Signatures"), field: "checkSignature") { - f.checkbox() - } - } -} diff --git a/core/src/main/resources/jenkins/security/DownloadSettings/help-checkSignature.html b/core/src/main/resources/jenkins/security/DownloadSettings/help-checkSignature.html deleted file mode 100644 index d639bbaf78..0000000000 --- a/core/src/main/resources/jenkins/security/DownloadSettings/help-checkSignature.html +++ /dev/null @@ -1,4 +0,0 @@ -
                  - Uncheck to skip the signature check on downloaded metadata. - This is generally dangerous and should only be used as an emergency measure when dealing with broken upstream metadata. -
                  diff --git a/core/src/main/resources/jenkins/security/Messages.properties b/core/src/main/resources/jenkins/security/Messages.properties index 2c93ecc382..fc71097d03 100644 --- a/core/src/main/resources/jenkins/security/Messages.properties +++ b/core/src/main/resources/jenkins/security/Messages.properties @@ -22,6 +22,4 @@ ApiTokenProperty.DisplayName=API Token ApiTokenProperty.ChangeToken.Success=
                  Updated
                  -DownloadSettings.disabling_signature_checks_for_in_browse=Disabling signature checks for in-browser downloads is very dangerous as unprivileged users could submit spoofed metadata! -DownloadSettings.disabling_signature_checks_is_not_recomm=Disabling signature checks is not recommended except as a temporary measure when upstream metadata is broken, such as due to expired certificates. -RekeySecretAdminMonitor.DisplayName=Re-keying +RekeySecretAdminMonitor.DisplayName=Re-keying \ No newline at end of file diff --git a/test/src/test/java/hudson/model/DownloadServiceTest.java b/test/src/test/java/hudson/model/DownloadServiceTest.java index 50ff400070..0b01c00c9f 100644 --- a/test/src/test/java/hudson/model/DownloadServiceTest.java +++ b/test/src/test/java/hudson/model/DownloadServiceTest.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.net.URL; import java.util.Set; import java.util.TreeSet; -import jenkins.security.DownloadSettings; import net.sf.json.JSONObject; import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.HudsonTestCase; @@ -41,13 +40,13 @@ public class DownloadServiceTest extends HudsonTestCase { assertNull(job.getData()); // and now it should work - DownloadSettings.get().setCheckSignature(false); + DownloadService.signatureCheck = false; try { createWebClient().goTo("/self/testPost"); JSONObject d = job.getData(); assertEquals(hashCode(),d.getInt("hello")); } finally { - DownloadSettings.get().setCheckSignature(true); + DownloadService.signatureCheck = true; } // TODO: test with a signature -- GitLab From ad0144f51f3bf5c104ce12bc3235bee807db9e75 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 17 Mar 2014 11:08:16 -0700 Subject: [PATCH 0989/1630] making the version more machine discoverable --- core/src/main/resources/hudson/AboutJenkins/index.jelly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/AboutJenkins/index.jelly b/core/src/main/resources/hudson/AboutJenkins/index.jelly index 8b43cd979f..259b52e9f1 100644 --- a/core/src/main/resources/hudson/AboutJenkins/index.jelly +++ b/core/src/main/resources/hudson/AboutJenkins/index.jelly @@ -27,7 +27,7 @@ THE SOFTWARE. -

                  ${%about(app.VERSION)}

                  +

                  ${%about(app.VERSION)}

                  ${%blurb}

                  -- GitLab From 485cc150eaa3d25dc64bc214a3f8a74194969069 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 17 Mar 2014 14:24:23 -0400 Subject: [PATCH 0990/1630] [FIXED JENKINS-19081] Noting merge of #1144. --- changelog.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index a43437a5be..6b4c00901e 100644 --- a/changelog.html +++ b/changelog.html @@ -55,7 +55,9 @@ Upcoming changes -- GitLab From 5de6a8d06dbc2fe7e34bf8fb531c6588bbc77db8 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Mon, 17 Mar 2014 22:30:58 +0400 Subject: [PATCH 0991/1630] [JENKINS-21190] - lib/layout/layout.jelly: Interpret norefresh=="false" as "autorefresh is enabled" The fix allows to explicitly disable automatic page refreshes in the @View extensions. Resolves https://issues.jenkins-ci.org/browse/JENKINS-21190 Signed-off-by: Oleg Nenashev --- core/src/main/java/hudson/model/View.java | 9 +++++++++ core/src/main/resources/hudson/model/View/index.jelly | 2 +- core/src/main/resources/lib/layout/breadcrumbBar.jelly | 2 +- core/src/main/resources/lib/layout/layout.jelly | 5 ++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index 0a418e1310..fee18dd273 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -373,6 +373,15 @@ public abstract class View extends AbstractModelObject implements AccessControll return true; } + /** + * Enables or disables automatic refreshes of the view. + * By default, automatic refreshes are enabled. + * @since TODO: define a version + */ + public boolean isAutomaticRefreshEnabled() { + return true; + } + /** * If true, only show relevant executors */ diff --git a/core/src/main/resources/hudson/model/View/index.jelly b/core/src/main/resources/hudson/model/View/index.jelly index 464262f320..b74f00dc4d 100644 --- a/core/src/main/resources/hudson/model/View/index.jelly +++ b/core/src/main/resources/hudson/model/View/index.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/lib/layout/breadcrumbBar.jelly b/core/src/main/resources/lib/layout/breadcrumbBar.jelly index f00fb45e99..ef1b411328 100644 --- a/core/src/main/resources/lib/layout/breadcrumbBar.jelly +++ b/core/src/main/resources/lib/layout/breadcrumbBar.jelly @@ -40,7 +40,7 @@ THE SOFTWARE.
                  - +
                  diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index 95d73c8d01..46acef6e2b 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -34,7 +34,7 @@ THE SOFTWARE. Title of the HTML page. Rendered into <title> tag. - If non-null, auto refresh is disabled on this page. + If non-null and not "false", auto refresh is disabled on this page. This is necessary for pages that include forms. @@ -67,8 +67,7 @@ ${h.initPageVariables(context)} which I suspect can end up creating sessions for wrong resource types (such as static resources.) --> - - + ${h.advertiseHeaders(response)} -- GitLab From 4bb0f98901e2836688ae6c56b9f112c105bc1c54 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 17 Mar 2014 17:54:48 -0400 Subject: [PATCH 0992/1630] [FIXED JENKINS-21190] [FIXED JENKINS-21191] Noting merge of #1082. --- changelog.html | 4 ++++ core/src/main/java/hudson/model/View.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index 6b4c00901e..739732fe96 100644 --- a/changelog.html +++ b/changelog.html @@ -55,6 +55,10 @@ Upcoming changes