From 98a6dde8297d40de465c46f36677f6fd1485af1c Mon Sep 17 00:00:00 2001 From: Emil Ivov Date: Fri, 12 Oct 2012 17:52:46 +0000 Subject: [PATCH] Change versioning to allow for an easier integration of SVN revision and build number. Removes version revision leaving the version to major.minor[.build-label] where build label may include things like svn revisions, dates, etc. --- .classpath | 3 +- build.xml | 7 +- lib/installer-exclude/libjitsi.jar | Bin 989119 -> 989066 bytes .../impl/version/NightlyBuildID.java | 7 +- .../impl/version/RevisionID.java.tmpl | 17 --- .../impl/version/VersionImpl.java | 102 ++++++------------ .../communicator/plugin/update/Update.java | 58 +++++----- 7 files changed, 65 insertions(+), 129 deletions(-) delete mode 100644 src/net/java/sip/communicator/impl/version/RevisionID.java.tmpl diff --git a/.classpath b/.classpath index 602ea85c1..9c95b5dcb 100644 --- a/.classpath +++ b/.classpath @@ -64,7 +64,8 @@ - + + diff --git a/build.xml b/build.xml index 6c66b91ab..51fd3f45b 100644 --- a/build.xml +++ b/build.xml @@ -49,7 +49,7 @@ + value="${label}"> @@ -450,11 +450,6 @@ - - - diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar index 8cd380beab8c48c4d89b621fea9452ce207f5475..bdeadc0a126f6eb1848771019c1597e25187eb06 100644 GIT binary patch delta 27008 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 J-Gn8e@_!e(;*bCU delta 27523 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

-sKHuJ&VTx- zTuc01@mUGGctKh6SLGRUjH&Tlbm0y(V=oyh?*{P+-l3ScN;7_4jq(#Qo%&PBSYx?O z7AgbcLD>JF0332W415y@@mBI|ixV;tC33wy#s^gMq!hRsL9G zO>b2aDf7~PDmu}H3{V{=BSR6X8bL}wakPpdA=ZS*nvs8&>cF3F8x_q%9CP7sf)o?_8SY?7z2dETi;&xczN@G!nz%j7Rga0PmOG2!Kog7Sk-{6SW9wMZ^#jGo#Sxafe*{UbyM_y zKOCH$ETFDmE>Ouxg>GI@H6&0?p~{Lpx|!Wo4Z`o}5ZLL6D&MG7=)@x`dg+nMlenWS zS8Z3~p>ptz3eGcy!S?B$iYLQv?|YRO-Xu*&Rnd{n1)n8;dO;^vZwmziM z(FwNI(dk3dq&W;vHOp1%LXDsjL0h#>yXLI?Yd8Vg_f59h31I_jCJ{Ee*6_yG1dTo- zJfc~sVG}Ay=2@xn+hv|>puR}Fx@WEaNhbHZ_G+HPGs(>F*;BJX(_RS*|12Y#4)Ab5 zROO-GM<$!o$DGoa152Pbi#h+jg&H=9LgZ^(sSn~8rYNv8HM_C1dM6=v@2b8+=62Hn zbva4ZkDlsjBz;o`sMnDFi8@@}RU)1lj+*vXHA$bSme;?FSLl3>M5)8oKjCdWzamoo zTZDm;>H<0YIWo}q`lKG4oWa8y_V7j#jao3MVNV{qVt`y*!< zI6k_v@Ax6Bg7dq(yp698$u{Zyc6Wi~e$y<`*3H90Km5oVd!%$gNl>lfe12n)GAV7n2t!N*40vBHbS|e@xf? zFsw%2C9lt!r@^QyWw@;vy6Aav!H;PMw`l`6Ec4^-S2&YF?=`b z?55G@BbgP=tJPP&ZB>U4FZJH>&ai5v>55}9L(V;YS7K=2Rpv9_>c+HI_bk*qdynnm zGpMO|+iXYKm9Z&}<&sY8R^AYg>69qD-}C%f(ev`DeG_M#XQO>03qw^7N6I_LHQl_Y zDx%fy#gg`y-zjrkR(}Xd>u_YLg}v`T&po2Qyz@7Ib71~?m%+<-=ZqNiPnQ3nK=bmf zEnQ`bx#Fx_)?PP`%5E+{U3`ovTe?Q$mVDQ*J zP4h<2X**d{aH{LgR!{qjj>i^EcI$BQ?Xq2Q`+vKNR@|Q1w-Mj^{fca5r^L5?O}Z`c z%u>WQwXJf@;x9Z^KKbUiqxYq<%$(N=>u#MrXgwt~Bk-+V=C%iU4R<9t_c_w}^^L+K z_G9x^(`V#=%n2>oHg?tWu+Cwdtj%l(*M6UUb$VNakUqN#ii(QF6TXJ^nVw@C8aen( zAalH8uwmS?3?+>q}t za@qelvEXt|aL@B*n|?YRy=->D*?eMI^y<@N9`>vrGuyuNhLs-i`!9ZLa`lo~{^q4q zn%n1mYNZ=~!QcGlB;WIGDp${+g(Rv;D_6aiK6+GWpEz^y`4(~C9M@bly7eSJ_>RMX zu8nhFg$zAg^d%bQQn-s<`-E`@j`8?OBrW+1~H-B|u z|A-;y4vG7R?b@e5+j-^uS<`LT1eZLDw@!Gp+n6bNb*K5fg^w@I2s%idv z>FAL^m2v4+rmnZbtJ;{yy}VJo@N~y2H(fWyz?gQse)h_f6n=}DlqHTW&@7pp5to!5 zI@Nyc!OE{&ZyB#mY~1(J@nx%`92?e_riYx_ana~PC$Y=E+7*|-wfWs}*u8+LuZP#= z&T2OMw%eiSA^nc@?RG!7D4|QynK7-$j_u}LQnqhoX>DeN!RloOJv@?KTeN9$NRqo( za=W1WnYfCIwAphO?H-<86RQfoIPCT9^P4m!cjNS0pAo-_z1h+9-G!vy>x_Cim;{By zOsM$h<(h?kI&Hhw$>{pN1EXSw@rO>=Y_}c~B0VzVg2STEo$tT$n3yp?-PvYaY+xhC z_*F>K$a3i;`!|(67uyX!(Qx$k&K(AMb@AS`YR|>vN&j})np3kwy{dCq;j9J!`0sV^ zbvOLUIk9T)?k91_zxigY85G;Bs?TDl^)*2m-4(98gA79nGXlj$V6Kxl)Y_NOR zz#9v__jEJL4d@aW=K93=^Guy5)BP`6L~Zc4=;N0@;rMQiMTeYeck*?7KRT>T`t-AT zGt*;sJB^Ynikdh_ZyeED=WP$uu#r;^@3^$adgsCU^L!urcAV7tVgBQpgG(w$L=Lx@ zpm;FTwt00+os6~TZPH3d-+0urpgPhrt|GkK@sa~){o9sx6s>>ktvViOwW8E8X2sT| z>aC|Dj9lZMIz9ZoBc%K9_HzA{_}UX2e_M^X8W7h~q(36<@rHWE71;-jURTmUj60hrXxQy{4dU%pS1q8LF2^x2~*7fZEtb4RWGZC z4fGQaEc%?jx%AwI4y`8ki`ts{sPmk$RxO-@rd5=18zxUnZM5w7xu&D0w{AJg<8u2K zA#r^=Jyl-uR!qEUX7pxtn;v?(?M6W?)riw zMz;p%w3s9h+aA4$4@u@Tc14}nD>qwpH(;jQ`xaGtA#3L;E_f`THFN2xCpQmwOg`lJ z;@0)-aoew+T;03F!tNTiZ=Brpsly9-1M|bO%nJvHS*e{f6UUm2p470#p@FLkdKY9Y zc3aq`i~aA{_RF7&H+%}WsJ7BxQL>7?=_|KW%|N5&qsdo{uAY>{}uD*MbaRd++5wLf-sigdkk+^$|j z^_vcOcv`jnNnpVC6We$1+r96jqJIKd8ckuG8e*<@U z1b=X-zP+}x->n{3?pM2T2FH)^1(6*V^=jQeZqL7OJqP9Vd-%EU(9A8d{^2ykFE@5o6)TGkU;IjpI<)4V=TX(n=ugp!(ElTze8}j*uYa74QS^h^9ndd4}B7INlPj_EqSbO>W!>6@cuaNm^ zGu3U#mVEzgbvoJIcaK*e!%Qb1GZD5DDQ2hqq zbctT1hI=2vMi}n&dEy=Tuf^(?{@LT z)l0};b$7D*yb9my@Y8rqcSP(4btgV=t-3pT5|D3Drw}M(le&OBwnS`EFT_!xm)q3O z1ncN(mii_>CP-+!E9NLX7X|AIXF1kr*m=%{|F&J7Pr^Q)t#&4x^p|_o7l;Q3_o*vo zc)K3-bo=p*aK<22kt=L^Icf*K>acnrxpvm9a@St|FWo?Hfaad(I0Ob*UXrUmOswSQ zsXr1|_n%acBUT!mRx3&D&S%v9Nv5uBTOk#m+pQERu(3p)OZ11{Q77OslB2!+;{V2NLxUbiha6yD~< zuT@*2pi(u%4}7W)$7fhVGkM|0`2I#s@8ukMr`}H74tuXYLf(sn#~K<|gW>+@`bW7< z`cJhArM`zF$Dm5JJ~^;ndok0Y7C6R=@cBggEsjC+ZouJfb`@k4d%vgI(ecNC<);ol zsMV`g8=}%1@XY)9qxvj%BKMPe2r+H`MIAw)xnI?!6_aY{!xw6um;4AEmHvlFLqnTmOi z^-fYVV@Q`gVwo$%lN=30UtHhOXHu~(G}e&u!UDSundA6MBZ@L%KHz8un=+%xE5NUI zjHwlLY^jQrSI>b_A)g13qTC0Z0dH)@IO1Ew$lI1F$CaD;@9iypp@}WwB&QEL-JEHJ ztR6zKQy+5ne1aV_lsNaYA)`y6%0>)5T0GsD=|#>&=0;jPm@!_JN+Ygsz zdSB+J2;a52an$S)n$wr*gt+H$c6hEovzH|0Ztt3?V~`YkxGLP2@#6CaGM7jXEE~+s zB4?#*impBQ0JB1zk`CEXj2f+Y#wk$e7jR*t|8S-TPYr_MmdGcTk)q|Js8?td^NLt1 zdXbPl0gm-1nvfFtyn=o>5yd1^_opy(NxVffm?F~hnX{Skq|upJ<`il4t8vU`a{e?a zk=aP9-@p7tOEt8ROqVzastx&GE0`uk&74%`AABM~vhH(&k^ObRA{=0y>uSB%7v5-$ zGDFu*VUl*wW;FcXHOxq2$#@HMp9CSFs2AD^(ltp;+5#BuQOaXZ!FSolkUInXnk;4_ z@l~G9NR08AVNWpQNseOknP#{H-~~em$;d$g{F{8n2B#b`XPDc;7{8WVTs%dnFe?*3@T)-2*ZR+40$zxif@3zfmayv z#&E(FW+-VDz_-S&qPWS#5U1zdX2y~Zcy)*AOqOJ~QpS_C;Dj1Y()Avjq zDSpOBhOQ+2KQq-hIzIRtbA~|1KZQa-#J-s=ZZ5b7Hgn*7+laM8nhF>Tak_97-1#^2 zf!w&Z6tQqGRhT=yq%2%d5};IF_9JPU%+dRfD4?qibWy}-#t{vvftQD8m8=0t!(E1T zBUw~&>>cuXfpz~W7Vp962rOd9>*=#9>=}y=}z4!3jNU%)%=eXfFP$Df^me z$~9-{b|cJ^wHNCPfuLzECY3@*eF9h7p{jR`H9GJMuFjokz*Z9}-iCz>Z-Voz9Xl6? zfsz}tc){dD9oWz05O!1Omo8zTXbCvziWTwm9NF2Vls_7?eX%xSe`JYlqgVxkIw(xkRuJ=wA3NFLT;OXMEH>Z5Q!Rv(+0;>Tu^v2~~O1;@qEC+~FX`$UO4 zc4qPIX;j&nt;QMtD*(AhgRHs|ACPlb_5o&)cVk~*uPVE-(}-75{%j$JP|EfuoTwi6&Ke`;pujUS;ro**IdQU4OO)>&4^UiqUAa-#AYhz|JS#_;s*Q zc_G!)!`MIq6@;^JoeKJbjPCa%Sml4-Jx`2a={>&7BiJ@%{;5l!9qy>kQLLpHf5@cy z=j|&$@V5|t{80P=xODzu1k^Yt3ZSu^MxQ@2mJK9+OUHvY!5Q!IYzb*dlZk9AtY=N) z{Vgkn%s?A9MjmGwxD}_-D9}lbhK)<^9T3#q!^rE)>9hQ|bG+q3b>_e4*V=AU8~BJ5 z7F+f?XdaNj9c^GxyG|W9zvHEu9RkJ63tw)X@?yioImO3%cJzK+DjHJOHu*%$uQ%Hc zyF30?z>)P!dT$HayE<+i_EP&n*KO*baCtEeOr~Xtr^|Jo?+jMThC0k z{9xXHSJRdI8k&3d`|Xiq+AA*LxNXl)i8~b1Hp8RZJ=y2>KsjgbzJjoeF}<@B?pNpD zuy}30MgC92ywmO}=vkB8XUbd<@1%b==2to%Yu#>mp!0>QZ;`gHwR-QD_xJui(fsVCpn%-`$DU)>t^Cy@ciYgc zht0Qmzub1>YQMa@Upx04zIOPqwOd>CeC#>OJ)qWk_WVBG4U3bin!Xrq_QGAG=j!n9 z+A@Rm$RVf4CLLR}->y+?151wy!(Gl-bT01Tkdk>fvReJ;flO#6i%Bqw1mN2wwh3;L zMw8hwc+1AGoX#G`?@IXYv1~6gvu4DxaM@89M$Z?p1Ia4uvxIfWo2Z5R_GfQ~K3DI`$gz_<1JV zjm%4Kn^*&~DsLIJl2`a8LLjPp&Id*Nc7Mk3PffaYzFs$eOT{ad2(f7cX!1M4PJB?t9pe-ieXN~Z`67IA3 z>q>O;K21XHeHMSYhzbcERjPQ>w*6@u#9H%SQ#Wo z5N%b?j>eNXl-CmFmcy`tsS&*_XNO}T@Cj%XF#DgdLomQSrRf~^lC7!+`P` z%-DieAX%aKXKZ6^W6v{4rJzIo9Lx*A_~%sO+;iF;jxQ)r!V5MO^E|5q{9aPb=9h#g z{S`$FtpoC2QNw1hsdLlnfE#sy+Z#$sdczLH7GAyqZ=rbv;MiO0h50*hP{2%j z2kk8Y7v51);|j1PU=~(@8$z_@6>J2?ba@XLT;}(XJ^@gCpamKCft`ynZ$GeeFfgW) zN)=Vo%r>opnhTm&Rk0&5P*X)o13yyI$&ZxO=o2L^`UE{JNPVpXqCQj1{W>7<3p)<; z94^j!{B3 ze65en+;#;8)xd<;{5#tjXK2=U%Jtwo&0>ciw1yc!U{neA6+dZNB7edJAYd;4q>gy~ zg6M@zClvri7c0F@aKU1lEcr zu1cwdO2&}}nIPlHuq>{_w9qB~pf$Rbr=|`FlT*y;I-rq)VwTkb6$*|F&tN6>{WKGonC_ z5l03PPJc6Fn*K4yRL6B=%Gkk#Vz!x37v!c?G}@GsN=#`+eavVgchvy~<}}AM%&D72 z=6_r6WkD@3w}5^S@>^v=bquzonA4UtRP3vl6_uD}MHM}^;>MDmYCwTw4X9^!)-;Sn zYl`_~O|=fTq0AR-I5MnS+j3;+XW4R-utGCCDmCAZlHS|VF%WLgk%_R_o??6&Qs7`i zZUz>2aiG9<2g+>Ri0WBb2UIoU$ea}ENX2hCQtRCtQ>lOJ04FEvDsti`V-t)s7lVN~ zXKo4xzBp6T*d}zSJ#9jH`nzybF;9^T)#KTeVh%N>%uSn7%(iCSEX-`Wn6HN0upPN%#Uz<~ZMz)|)JZM2ly<5_3 zoNq~aTD78j_O+rU`_{BI6IxRb-?ygBVQr|Z#cinOE^R4rye&5y``or2wY9$;4cVnV z&HVcIB*63zv{|A%(1>qzpn-Pqq@-+5s>a5PVv@WlM&eDSqP(f^<=&L1S4Ud*Q+0s5 z50%>KLlbZ1OT${^OLJN2OH&x>M=`~IG-B^g)c1Yx=_QWOqBCv7)t#x&zdBR#m@bsL ztP8c(uPfy_*_Gz0Wj9*eoNm--^X{~ZmvpCkzSm)*{HYsv{Hf+{J*e~hdr*HY187Z> z1E{U9b(p9?s_;P|)zhOVl{(s!>ap%cttZt1-+NK#Ck9dASrC;94yLxw1XIneLTD6Q zL#TCiZ`wz3y(#8Z9T3uoGN0^2{b|;hy0NA&omy)9()7;i$IZkE|J;vOIl4bJTGpS| zbie@WPvHQnu%^8$_(952l?ucQBo3Uk#>RGbofwUkRlcuOSq3UIVIVbs%C!>H!a2#UEBK|Sp_oH8FBPUCZm zq^_n#(jZ3Ae2pDJ>vwkqoxr_EQd0IvS^)h~H1G39QBxJ8Xx{scrlmbSnwG6q6pdzY z6vfz$p_q&@6vK|Cn8jl$rlt-vX&kjxI*vLPIGzS^vJP;Mrg_>GO_@z5P(8~hP@g|d zpyCk|>7svjA`Q?vhAuj(F?1sM5<^1{pG1MeNgUZn+fAmCE}KkApXxB7Q)ujXC44f4 zu7uW8sYF5@@O~;a2pcm?6f=!$i5qk0H27{=SY&mlQ$NN{r@j_Vr>fh{pjNld;06oK z=`-neB623(pMa~DsB|Vr?#f!uq5_L&Q8y~;fPS+n2K?=d4I9m&Z4o!8Zmi9rt_H1_k`pxW?xg6Qd-kD3chHd9TLkjdgb%1poHxFYr#nIuQHy@@kfhS=;E$X-V zRDF0n4f%3BjiA*6D44*!egPMN_w%n8(50p4Lhw!?9bHJ%VZMmgd&wdi)5k?r^Pt7l z`XvDnr0_{V{{+qrXJKgq%}ZqhHQ0X%Rex#;joEQ2I3BeeGGVO~S$uziDE1*FH@pUU` zgZx}UvmTZLDG^AgQ-CA@4O6Ml%jRNRq&FekE1tvWiM2ucCUY>M(uMD9^uj zK!ep3vtTuK?D=Xc-fayXfXCNRl65*|UYHJr6^wqU140qST&M$DtfiPub$~hp<}g8O zK?cqIy9{nA#>`kpM?EfM?K)aUkM*?PYuD2bkZgc5!rgW>egjS0)eV%?E|W5E&g6n| z7ktX31qt0q8}Y(M+K6DM2j&50OO&yRYlZ&>2S?~KM>RM-7vxg^>=sEMXApos^iKY>Py!g+Ne1> zG$#AKlsR*6o#lPp60B!M9bmSfMzDE5EvV@Ms%P#2x(a+bKxc(<2f-ihk-)y`*dihBTFg|vm&H+BDI#iz|g5hpo26nu(ngjtglJ03Bipd1&Z6pF}6@_-xFaL53E3QKe$&AtfkpI@xPLf&u|V{=*HF@ zy=X{;g)w}IttE6ZSzE{wX|{qTp^Esf6I8G_+@aC7v~q2|kS&6HP-ZCn9K;|rROMNS zq0xqVdfPvw3Fm;sZ>lFLk$VAWhR&bk8WT~09=AoCPEJn43Vx?LTI|kBa{ax zvAbt`|6s_xG1PR3mL*vZ^(;r-8U47!l5(bA0DZ;#>PepHWFcpORsFfd1#i~0RGm3o z&+mZRNI3(1{D*IKA-D6Ku{i%&Jp;bjWr1^7a}jLa%_AiDLarsw&A$BL(+1$N8Qi1M zE_>0*dRE&%ZaGyp(HAaaeS@EFT5feXP5Fhc)w|4Dqv+Gnl@qdQZsvUNSRi~cwE=o% zu$E-EGyj#Gbq3z}3SEYq{@Nw*d~<;|lRM6mvh-%pSD>`l|0tCfYV$KFVFLCe3gj18pCx8l?8utC7j z0l%-7Lvv94buJh))!*L(#&%jvE#So%*BvLM!wqmMzKXaSdxNva*h~R?<0HYsbv<*8 z{VrhdeyYdHk>5=Ye;$v90U&Pkg^&Wj!1TW21`WGVAg%vONC&>EIn=H(9X^$XQyXN1 zXTRa6hn9y4-w1!%Em$>|-Qo;!UN_wWRp~YLqz)KsT>{uIKkBh|XnqOjh)KHyQv5G% zk{nL`VOqq=7nYV!#$AsULL$$@1lL{53$C_a(iWxPrlV-jZBXh3e{1A9X8|_}p@qb7 zBhGp!jaTmukj)f-$U^{u^EX?doL1IR@D)TgD!xMnO9k>y)gQ9cUCs>82>O=Qp(fy= zH!ObI8;cb6ANJ(Cv`)M3f}$TRrl7LBoEvW9H#NQN?n5i=5-w_Jg?UL+r-VWM?s1lw z-Jzjxa7Wr=+B=jl`h?v8F6clKg;8GL^h*r|ngcSsPfOhV`_Btu;Ce8)-bu^qMauff zkg-GiKeCK1ydLru-_X0d9{7Zdr`k=MU_w-{H(^XsCFsXFt-TMi&NL+?xLrvW&gch# zePUUU#dj{P@n-3PKpJ98NN~N<4y*Bb2v{GxdMv(l>556G1(M7`nU~fO zH#%*xjX!re|7%0s^e=w6-DxZsshg9_OTpn#SHb~zGv!VGY#IeO{@nWf?^3<_j}X2B z+8DbbYRDR#fI1(7ZWyE$YNlJg5gB^-7@h=#iN9GH*uUQVFB04)C3i#7go^s51G{O~ zmaxGkQTbncTR}~wpeBscS9mc>GzV^yBL8wavCbYcB8OaF{cjktotQkk50jCoWp*b5Ol=uprtNT^kGo z;O%qj%Xfj)aJWEfCR~QK`{QBEC;{7uT!-EFg1UL)1qdAZn^ZgsK02=-*d8x|zB!7B zmc8VZ=u{NkWKMZW;QE!k#nwgAJ6CCiTyM?)GlE8L+c0HRO zI{S*V!gKAH*QWO4paVL=YM?y^p1OxUQFgbr}Sv{miO3jYQR)5h~7SIAnR6for-NP2HpTgZJP@lQV?F z?F_W8%LnjVxZ)sK5KGPyl5lq!%>oi$-iBAZPZvJeE`y)H-OY;k{ljmBiav0SG5?Cd zR$k}8IY;34s|yHzXT=wutJm+2f)(`-^ZVOx3aEg7+YK|Ab~qIU^%6!XrxKp#1!sk; zLgMCyn3P_{nPQ|x6(FPQk!m!z5N64VRW!hP0y*hYos1f7xCCo5B!|?kOd$8ULagb3 zD(u}Kql=Bp7j;dC;VM#7p)ZbEG4X=rHr1|6d|lEKA#15%LvEp z&s+oS?m7XR_KaX{-@xSh;4_`;Y6X(Pn|cz=WuNKr{d4d8zcmq62>kZKC2&VljxV64 z)q8^FzS5mzQvk&LM}i$!hg~LMr+yZ&4TV2yu8WGlat1cSHY#*})24HTbqv1$Z>kma zg!F2z12*Md4dN|+3gS*E@Tc%4gOFsQDKZ6;-fu#JYvc@iUq|{SklMlD8Ix)npp0h1R#0CV%Kx2{qhV1ZIm)krGY26Pf!_}~u7L4S1kw1CY*b2_1hgaDM?^f{%P?d0{)$M*_CBAAuMD z;desoL>faJ^Z^l=TGg&zl^aqmqN?=$UN`9mYQ{ha+IjERp`PCq%@S+KDa8sgsCwr4 z7wNHBL!R{U0Y-?QKypBy5)vf}kbuBSimi=Tsu7ZaE@8IJ0g}iAxl1*T5T<;SXvm;7 z%<+^9&-l0Cr=?aSa$N-depnvY1pY)4*mL=NvnC9%Z7;*OF9gYz@T0x!fWPQ1)dXS% z?lSPLQ8yCIumH$@j7&ogGgb;DuDdo#iX6K`lfz#pC#Sxxof02ThvfBv#??+<0=%0P z<~mSnfI8}GOtHN|x}daoKt0J8B^gpxlgErPItISJfFJGS^wxp({JN+|AZv|m+EowM7WQ9#CrJXtRPE*slNsQ~oBwU#YUkV?*l`k2>w}J1ZXaD>Z)Di$7m^{CAB@ z?OSip1$$Ad1XBb0*JI_#Mx`NR8gI_}pkXSF8{Rz+FKN8J5lmsHVK?KWWqPH+1RGkl zhC!t&jg6o=T@8wjLQ#ZD(@>x^$2ucQKw%EjXahAFC~oKU!&kqg)Pjkv*#9 zG&cV;%%Y~;YaR!_c7z8X?KT=B2=u@Pgqz*)e^atWqiLX}Kv@2@zIV~e^LRm^HCAw6 z10MQK5^8T$|2d2t1x{jFlwS!;p0G!Nd+e6pwv$<%iIYdWjU6*}${4q4Q^$;V`+H^( zELLo9cFYy3`UFnOZM7`+L@9b2^7X-KJ&mR0*mM?cnGP4pf9OH!1RE-t%wZL9)YrJ+ z&C9l@;?UIg)I8A06xFlUB;^H@QIl3 zUs`nF4HW%PcpQmB8Uu|3?#@47hUn;c)bYUYtoZc;lQ|k^plOUf)cQz7i*q?TXrS@N z9rx!u5%}Ori)mdF(lgMQqGCgh3}q&nvgl3=!Lk)RPwB8UZ z7nWMD#0huQcLDo+RXx@S`59>p?1bw4rRYE5%h$2!Lk4{0l5C_QpVO@~f+DpiXcKf* z_?J+mcLKm}#M~yx))*!vL37Hoi2YYY@I(al(%#Y!KoQ0o@(sjBV~`!cg+(1Vu@0!r zSVK0c?ILgQ?*X&P8~F2Mj(@qB6@Ll7uh+D~cHyfFOYy*iD8v+o{2UY7GRsXM)@2l% zX981}u$?Fuuq*NeUI-`;78T*usvUW?`l;3Qu?@h|MtdC{=!*LPvf^`5u&Jh{u1OKR H0oM6Hu-!TQ diff --git a/src/net/java/sip/communicator/impl/version/NightlyBuildID.java b/src/net/java/sip/communicator/impl/version/NightlyBuildID.java index 938193a31..4dbd93d3e 100644 --- a/src/net/java/sip/communicator/impl/version/NightlyBuildID.java +++ b/src/net/java/sip/communicator/impl/version/NightlyBuildID.java @@ -1,5 +1,5 @@ /* - * Jitsi, the OpenSource Java VoIP and Instant Messaging client. + * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client. * * Distributable under LGPL license. * See terms of license at gnu.org. @@ -13,8 +13,5 @@ */ public class NightlyBuildID { - /** - * The build ID. - */ - public static final String BUILD_ID="0.build.by.SVN"; + public static final String BUILD_ID="1234.5678"; } diff --git a/src/net/java/sip/communicator/impl/version/RevisionID.java.tmpl b/src/net/java/sip/communicator/impl/version/RevisionID.java.tmpl deleted file mode 100644 index caf93775a..000000000 --- a/src/net/java/sip/communicator/impl/version/RevisionID.java.tmpl +++ /dev/null @@ -1,17 +0,0 @@ -/* - * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client. - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package net.java.sip.communicator.impl.version; - -/** - * This file is autoupdated by build.xml in order to set revision id. - * - * @author Damian Minkov - */ -public class RevisionID -{ - public static final String REVISION_ID="revision.id"; -} diff --git a/src/net/java/sip/communicator/impl/version/VersionImpl.java b/src/net/java/sip/communicator/impl/version/VersionImpl.java index bafc75c49..cbb16c70b 100644 --- a/src/net/java/sip/communicator/impl/version/VersionImpl.java +++ b/src/net/java/sip/communicator/impl/version/VersionImpl.java @@ -18,18 +18,18 @@ public class VersionImpl implements Version { /** - * The version major of the current SIP Communicator version. In an + * The version major of the current Jitsi version. In an * example 2.3.1 version string 2 is the version major. The version major * number changes when a relatively extensive set of new features and - * possibly rearchitecturing have been applied to the SIP Communicator. + * possibly rearchitecturing have been applied to the Jitsi. */ public static final int VERSION_MAJOR = 1; /** - * The version major of the current SIP Communicator version. In an + * The version major of the current Jitsi version. In an * example 2.3.1 version string 2 is the version major. The version major * number changes when a relatively extensive set of new features and - * possibly rearchitecturing have been applied to the SIP Communicator. + * possibly rearchitecturing have been applied to the Jitsi. */ public static final int VERSION_MINOR = 1; @@ -40,16 +40,14 @@ public class VersionImpl public static final boolean IS_PRE_RELEASE_VERSION = false; /** - * Returns the version prerelease ID of the current SIP Communicator version - * and null if this version is not a prerelease. Version pre-release id-s - * and version revisions are exclusive, so in case this version is a pre- - * release the revision will bereturn null. + * Returns the version prerelease ID of the current Jitsi version + * and null if this version is not a prerelease. */ public static final String PRE_RELEASE_ID = "beta1"; /** - * Indicates if this SIP Communicator version corresponds to a nightly build - * of a repository snapshot or to an official SIP Communicator release. + * Indicates if this Jitsi version corresponds to a nightly build + * of a repository snapshot or to an official Jitsi release. */ public static final boolean IS_NIGHTLY_BUILD = true; @@ -65,15 +63,15 @@ public class VersionImpl /** * Returns the VersionImpl instance describing the current version of - * SIP Communicator. + * Jitsi. */ public static final VersionImpl CURRENT_VERSION = new VersionImpl(); /** - * Returns the version major of the current SIP Communicator version. In an + * Returns the version major of the current Jitsi version. In an * example 2.3.1 version string 2 is the version major. The version major * number changes when a relatively extensive set of new features and - * possibly rearchitecturing have been applied to the SIP Communicator. + * possibly rearchitecturing have been applied to the Jitsi. * * @return the version major String. */ @@ -83,10 +81,10 @@ public int getVersionMajor() } /** - * Returns the version minor of the current SIP Communicator version. In an + * Returns the version minor of the current Jitsi version. In an * example 2.3.1 version string 3 is the version minor. The version minor * number changes after adding enhancements and possibly new features to a - * given SIP Communicator version. + * given Jitsi version. * * @return the version minor integer. */ @@ -96,35 +94,11 @@ public int getVersionMinor() } /** - * Returns the version revision number of the current SIP Communicator - * version. In an example 2.3.1 version string 1 is the revision number. - * The version revision number number changes after applying bug fixes and - * possible some small enhancements to a given SIP Communicator version. - * - * @return the version revision number or -1 if this version of - * SIP Communicator corresponds to a pre-release. - */ - public int getVersionRevision() - { - if(isPreRelease()) - return -1; - - try - { - return Integer.valueOf(RevisionID.REVISION_ID); - } catch (NumberFormatException numberFormatException) - { - // if we cannot parse the revision number return -1, so we skip it - return -1; - } - } - - /** - * Indicates if this SIP Communicator version corresponds to a nightly build - * of a repository snapshot or to an official SIP Communicator release. + * Indicates if this Jitsi version corresponds to a nightly build + * of a repository snapshot or to an official Jitsi release. * * @return true if this is a build of a nightly repository snapshot and - * false if this is an official SIP Communicator release. + * false if this is an official Jitsi release. */ public boolean isNightly() { @@ -133,8 +107,8 @@ public boolean isNightly() /** * If this is a nightly build, returns the build identifies (e.g. - * nightly-2007.12.07-06.45.17). If this is not a nightly build SIP - * Communicator version, the method returns null. + * nightly-2007.12.07-06.45.17). If this is not a nightly build Jitsi + * version, the method returns null. * * @return a String containing a nightly build identifier or null if this is * a release version and therefore not a nightly build @@ -158,10 +132,8 @@ public boolean isPreRelease() } /** - * Returns the version prerelease ID of the current SIP Communicator version - * and null if this version is not a prerelease. Version pre-release id-s - * and version revisions are exclusive, so in case this version is a pre- - * release the revision will bereturn null + * Returns the version prerelease ID of the current Jitsi version + * and null if this version is not a prerelease. * * @return a String containing the version prerelease ID. */ @@ -197,13 +169,13 @@ public int compareTo(Version version) /** * Compares the version parameter to this version and returns true - * if and only if both reference the same SIP Communicator version and + * if and only if both reference the same Jitsi version and * false otherwise. * * @param version the version instance that we'd like to compare with this * one. * @return true if and only the version param references the same - * SIP Communicator version as this Version instance and false otherwise. + * Jitsi version as this Version instance and false otherwise. */ public boolean equals(Object version) { @@ -216,13 +188,12 @@ public boolean equals(Object version) /** * Returns a String representation of this Version instance in the generic - * form of major.minor.revision[.nightly.build.id]. If you'd just - * like to obtain the version of SIP Communicator so that you could display - * it (e.g. in a Help->About dialog) then all you need is calling this - * method. + * form of major.minor[.nightly.build.id]. If you'd just like to obtain the + * version of Jitsi so that you could display it (e.g. in a Help->About + * dialog) then all you need is calling this method. * - * @return a major.minor.revision[.build] String containing the complete - * SIP Communicator version. + * @return a major.minor[.build] String containing the complete + * Jitsi version. */ public String toString() { @@ -237,19 +208,10 @@ public String toString() versionStringBuff.append("-"); versionStringBuff.append(getPreReleaseID()); } - else - { - int rev = getVersionRevision(); - if(rev >= 0) - { - versionStringBuff.append("."); - versionStringBuff.append(Integer.toString(rev)); - } - } if(isNightly()) { - versionStringBuff.append("-"); + versionStringBuff.append("."); versionStringBuff.append(getNightlyBuildID()); } @@ -258,10 +220,10 @@ public String toString() /** * Returns the VersionImpl instance describing the current version of - * SIP Communicator. + * Jitsi. * * @return the VersionImpl instance describing the current version of - * SIP Communicator. + * Jitsi. */ public static final VersionImpl currentVersion() { @@ -270,10 +232,10 @@ public static final VersionImpl currentVersion() /** * Returns the name of the application that we're currently running. Default - * MUST be SIP Communicator. + * MUST be Jitsi. * * @return the name of the application that we're currently running. Default - * MUST be SIP Communicator. + * MUST be Jitsi. */ public String getApplicationName() { diff --git a/src/net/java/sip/communicator/plugin/update/Update.java b/src/net/java/sip/communicator/plugin/update/Update.java index 749a1e710..4a2795000 100644 --- a/src/net/java/sip/communicator/plugin/update/Update.java +++ b/src/net/java/sip/communicator/plugin/update/Update.java @@ -98,42 +98,39 @@ public synchronized void checkForUpdates( return; } - Thread checkForUpdatesThread - = new Thread() + Thread checkForUpdatesThread = new Thread() + { + @Override + public void run() { - @Override - public void run() + try { - try + if(isLatestVersion()) { - if(isLatestVersion()) + if(notifyAboutNewestVersion) { - if(notifyAboutNewestVersion) - { - ResourceManagementService resources - = Resources.getResources(); - - UpdateActivator.getUIService() - .getPopupDialog() - .showMessagePopupDialog( - resources.getI18NString( - "plugin.updatechecker.DIALOG_NOUPDATE"), - resources.getI18NString( - "plugin.updatechecker.DIALOG_NOUPDATE_TITLE"), - PopupDialog.INFORMATION_MESSAGE); - } + ResourceManagementService resources + = Resources.getResources(); + + UpdateActivator.getUIService().getPopupDialog() + .showMessagePopupDialog(resources.getI18NString( + "plugin.updatechecker.DIALOG_NOUPDATE"), + resources.getI18NString( + "plugin.updatechecker.DIALOG_NOUPDATE_TITLE"), + PopupDialog.INFORMATION_MESSAGE); } - else if (OSUtils.IS_WINDOWS) - showWindowsNewVersionAvailableDialog(); - else - showGenericNewVersionAvailableDialog(); - } - finally - { - exitCheckForUpdates(null); } + else if (OSUtils.IS_WINDOWS) + showWindowsNewVersionAvailableDialog(); + else + showGenericNewVersionAvailableDialog(); } - }; + finally + { + exitCheckForUpdates(null); + } + } + }; checkForUpdatesThread.setDaemon(true); @@ -858,12 +855,13 @@ private static void windowsUpdate() if(ver.isNightly()) deltaTarget = ver.getNightlyBuildID(); else - deltaTarget = String.valueOf(ver.getVersionRevision()); + deltaTarget = String.valueOf(ver.toString()); String deltaLink = downloadLink.replace( latestVersion, latestVersion + "-delta-" + deltaTarget); + /* * TODO Download the delta update regardless of the logging level * once the generation of delta updates is implemented and the whole