From 9d2cf0791846e6b0c71c8497cd1ca6a5255aeacb Mon Sep 17 00:00:00 2001
From: jmoore <jmoore@05709c45-44f0-0310-885b-81a1db45b4a6>
Date: Thu, 8 Apr 2010 16:49:55 +0000
Subject: [PATCH] see #2148 - Adding "./build.py -perf" option via ant-contrib

git-svn-id: file:///home/svn/omero/trunk@6552 05709c45-44f0-0310-885b-81a1db45b4a6
---
 build.py                  |   5 +++++
 lib/repository/omero.java |   5 +++--
 omero.class               | Bin 4897 -> 4956 bytes
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.py b/build.py
index 3b2f61ed496..dc975f27628 100755
--- a/build.py
+++ b/build.py
@@ -126,6 +126,11 @@ def execute(args):
     try:
         if len(args) > 0 and args[0] == "-hudson":
             build_hudson()
+        elif len(args) > 0 and args[0] == "-perf":
+            A = list(args)
+            A.pop(0)
+            A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split() + A
+            java_omero(A)
         else:
             java_omero(args)
             notification(""" Finished: %s """ % " ".join(args), 0)
diff --git a/lib/repository/omero.java b/lib/repository/omero.java
index 45757dd227e..6736407af31 100644
--- a/lib/repository/omero.java
+++ b/lib/repository/omero.java
@@ -190,13 +190,14 @@ private boolean isJDKToolsAvailable()
     private File[] locateBuildJars()
         throws Exception
     {
-        File[] jars = new File[6];
+        File[] jars = new File[7];
 	jars[0] = new File("lib/repository/junit-3.8.1.jar");
 	jars[1] = new File("lib/repository/ant-1.8.0.jar");
 	jars[2] = new File("lib/repository/ant-launcher-1.8.0.jar");
 	jars[3] = new File("lib/repository/ant-junit-1.8.0.jar");
 	jars[4] = new File("lib/repository/ant-nodeps-1.8.0.jar");
-	jars[5] = new File("lib/repository/bsh-2.0b4.jar");
+	jars[5] = new File("lib/repository/ant-contrib-1.0b3.jar");
+	jars[6] = new File("lib/repository/bsh-2.0b4.jar");
 
         if (!isJDKToolsAvailable()) {  //Try and grab tools.jar.
             if (jdkTools.exists()) {  //Add it to the other jars.
diff --git a/omero.class b/omero.class
index 0720d8e8d0691bd2afed561a3799f99078c244d8..6893b97bf769120e73f41c2af35306064180c2a3 100644
GIT binary patch
delta 1883
zcmY*YcYIS-6#h=%OWw`n(UzAM2vBIPz>lWGvRj4%Y6V+R0@R3NQ>e71G&PMVVvT4K
zaiH>0z{POXfyy#LBEbQQWjT@M1W`mBfZ{~YP3ceg<9+Ac`_A~zxXXJS=n-l@y&(o5
zpE~OBqCvxLIy?vo+^%B+W^1@Z;7%QOG-{Zm;VvCTn5#oaqYek|mN3tO1l%LFdnMeb
z;eH(^8U*G``GCB9P~ahXSRi1@^FrzKut4Y$9gDEofhBlUM^8K^@VJyuNO)4hQh{aC
zqfvS+*RVq1DS@XY%V#t^E6^nHoWSz}F9^ISuu|Y9olResfnO0=C9qmxjlfzB>vR;L
zLBgvJ4jJbB5qVl5ZPyFDCa^&uD)73Duu(!x!X^!GNDgmmcuU7fyscw1wn%tK;9Y^O
z0`Cbl%U|0BW@y;1VTXpD8g@yZ?@RbV!-qOP!p9mu5!kI`B0km8$&NiT@?Kf$KADT@
zC1AgX18W!3GRmw(6~X48UJ>vc_za&D+QbjJlWTnS^#;DcmsY9LSE<BT)_f(s%hxz)
zpc01+e1pRVrl7*Wx2QGn9cry+B|mfo-y1lJgM^gys`~U=e=yybKBX#9F*)cD%*-|L
zgZ!t|RF%s(#|&JL3WB5BH^Y}($*DE`Xy7OOtl<{}$8o~IN&LzV)d9}*8%`Pc9e)`3
z6MqpB^Egai(C@FQ&#m?a3`_-8ShLh3<!}6BZBh4RoG%Rm6?OjlDw#gdR~yWk?5_<5
zs>*Znb1x|GV=c0E7t>_{r}3|~**3V_5rRQP3529LsdyuD>wLjVgA`J&ZuUVLH=@db
zA9V)m5oCL5m{(g7%o{(p*dQC(ty%Ui$(5vOBn)zpZcrOCtR{P@(w3Q#=FLo`B!iNv
z9U(dHUE`~rnm4Arn){@YX^@jrtOjjRhtzn(sl7oRq;^um4BWJKmp0Dk_JS}O3Qv>=
z!Otu~b~7%g#--e8o-kwe+R<&3h^ASS5=S^|*hFPlJOAL?S*y0zB@XAmrxLrTa$VAa
zZT7;(!GU?nnw6ha+|HeBkHX<Kdq>dSlNCW9Yj#qat8cbDmbDH&JlVzWRcuX|#yAv7
zRwSugXe%#bGs>|IHQ0_IcAx<}F$cRa7rXhcl?iYI0+I>ejOY9+%OO#i-Uys#zc5nW
z{F(h3vRjp$RwaHjfKTz8fvkklv4u)Va<Ow<U>`^2ah=IAg)5Ue`bJT}ISNaZp=s{e
z3UtYKr}Yk_eHepEv)5p-l#L2C{d>q9!g+?S$AzV<*{`L_uFzON1i{ZC8HdrCA44YV
zy>JA5a103{@UEOmS;Pb+kxcU<?pJ3{B7>R3&OQt`N1U6%jI%tBwm5-KJpS`=io@^*
zFmkWR!__%B=zgBZ#r$1Tl9e67rP;BKC>pKw52>kY4wsdZld5K?s$AJ+o<^0+IU2=C
zZ%zcG3f1+v+@*$5?2g&XHlk;t&8@g>iaWL*eO)$p%q;Opp_ZAW<BF}!9K%YnOEs?u
z<H|z2%WjUfZ-mFII5E!SRh<~`@!Fi2;0YsCTBy0~VO&)xT$)R;nb)hh*@)PL*x>5Y
zCS;aGVfVHU`x>4fclz3vF>*1JHm#2LErJcaOf8L{gbrN14JvW@q#=<6Qpka>q@x$h
zJZggiG7uU@Nf<@R7)R|ekxWb>C#F*h>i9j)q>fljow1a<AVTTbKxv3lSL~yVvo@1(
zGiGvHxtaaA>+(g&ZM?38S(cf+ZW&8pQ&%c0`9}-8L}^65V59L_aFUxRbW7{RkjpU=
k*fcSU1l~Mfv75(M{{K$3I1hlJfoMww=P;SYehIksKlU|}MF0Q*

delta 1852
zcmY*ZX?Rmr5IvLkl6UiXP0CA44NzL_CrFdFAA2c_0?K9!LZ~I6&_GKUTZ(N#z)Dn5
zaTlWkZY(Z!K?RCwZEbL8M^RBWQ3M4AQNRrsaBfOJ;74ZW-a9jA=FGh8@3OK>aLd`o
z2!QU?PR9h)Xt-U+ILsFa>d3_%8txRhONR{$G%VC`w~k@BM~99DI_$VtibZx<aG$j9
zm*N2p59%;cBk+*a56jC(1Rj-##R8AXb4bQK&L~glcoIwOSc+vjy5cE;r=@;Iif5&G
zPGGr=SRf--Xjmz*O5k}}<qH~K6nIIXR^VlUR|H-acui-&)iUer0&fVsDX>Oht%h|v
zGEpN%ot^Wo7kEoYFcXWVZ&;vSph4hmfkv63Ns4!*Xx0#s1#Hmpu8t9SPsjWCK#C6q
zJ`(s?V57h$`LtPJmWC}Fwrbd>VY@7HhZLV^_*BPEe5T=ZfiHAS#4btdmkBcSSF+FD
z5{t{TV2_5qbxUXkr4*r<V67-GtgJAw5BmviqKEWpWr3<H17G7nXrj_fDZ)3Q#Y%F=
zZ*kB-5xz5U2!{<!LxF+sQEuP|l!vw}-GfJP)WDB8NQg@=sY;$vQJow}E-0xioK{^?
zIXB(FPx4JEE14?u95Yae0)o9XFguW5%+MN+8~7O~H2h-VSDZ9(3a2@sw6f5^Z}{E7
zANbS2UpPZ>WN?~{>WYf8s`S!8rGe?7g3x?*xbipt32jn$hc;T1M42q_U;Gz3VI7ck
z1ZNGLBM_WX$Y`7CGXvGd1`%08BW?Y2s!?oU2AGgaR1pm6m@%WUIwN;nwm}N1goKOl
zhDxfkD*^?DTtX39HL@9`kub<kdT6IDPie#Dcr<^CK`{n7$VrHeCMXNcD9RW!wUo)x
zDAu61WQJ<B{t2!q%M@o&ytGb9F$=Tn&S>MUo(Ww1R46<~W}iPSi=;5Br$@EiVje5Y
zlDauDPNLG#BF9kI&FrFbsEr?(61GZ02OLBAwX^ezcy3n)u+Jt~IXO@hYYR<sW~-_7
z=n-mgCc1liJ(1M)=;HHcd)BZ6p_FA79HA4=q~K=$mbYLEwlelM%*1xg!4AyBE?fWx
z-`^sEIWCvsRMrEVVEXIfGJAy)@8O@>n}xU4NNY8sH+}dNz3IzF7?)irBWUBiz#h)Z
zLpzUAz>P?ZUQNhkjD9)FphQn(6*_u7i9Nz-7e-c|cOCjmy-=arbBE0Vj5DwSgYwpL
zTuX<Yps{@j0*4XH%ie)^J%#OVIEtP)&WOA)!Sj&A`6vrXF|T5-IxvV#W?p^qVX!&m
zQUo(v<w?Zwq}$^(F6SM$$bqwDuE@tjvvbmYJd2_HyCx^qTaRnKk!B1Vt@Kgj)wCeD
z6_*yTdgE2@Y`AZs%IzF$!U%s_Jw|4!4H)HC!??~9vE?_TYnIicxUGsO(tw_Bt0!V+
z`=nCy&77!V%{NE0k?mH^F=1SvWpmriv9@N6^D8d+e16r1@jk!Rg<M}4H)Lt<pe>BN
zEaBGNg54(g6%RWRyAV70^J<Zj(*&Epb=Z@5e$4cZEo0<nZrZRm%3D1e`JbzW_{m7%
z=2fU<g`I40kcK!C=tOpOW1T@d`cWGUCI^C}$cgb3i%Ha$|4>YnlM6Gc9p+L3mQs5x
zrw*v6Bs5Y-G*Ke<Qu0NcNw}5wwPiDVGwbpLklQ#phpU`o^15|i2CKSSS<MeE)j6aS
zT?s37gNw$d@`UELP7LXs!@{nPCRlj$^0PfWw!np*Y6<QGL46TJnU_>DkK-)3?SCP)
BidO&t