From d156971b15d7e83cc3d9d2514da6fee606642ddb Mon Sep 17 00:00:00 2001 From: rkv Date: Tue, 27 Nov 2012 06:11:48 +0000 Subject: [PATCH] Ant script is improved so to sign the launcher jar automatically. Check-out icon is updated. --- .../Ant_Siman_War_Builder.launch | 7 +- Workspace/Siman/WebContent/error.jsp | 12 +-- .../Siman/WebContent/jap/splat-launcher.jar | Bin 8619 -> 8627 bytes .../WebContent/jap/splat-signedlauncher.jar | Bin 10244 -> 10249 bytes Workspace/Siman/WebContent/jsp/toolbar.jsp | 2 +- .../Siman/WebContent/skin/tool.any.old.png | Bin 0 -> 192 bytes Workspace/Siman/WebContent/skin/tool.any.png | Bin 192 -> 1439 bytes Workspace/Siman/build.xml | 91 ++++++++++-------- 8 files changed, 57 insertions(+), 55 deletions(-) create mode 100644 Workspace/Siman/WebContent/skin/tool.any.old.png diff --git a/Workspace/Siman/.externalToolBuilders/Ant_Siman_War_Builder.launch b/Workspace/Siman/.externalToolBuilders/Ant_Siman_War_Builder.launch index 0846a98..00f4d15 100644 --- a/Workspace/Siman/.externalToolBuilders/Ant_Siman_War_Builder.launch +++ b/Workspace/Siman/.externalToolBuilders/Ant_Siman_War_Builder.launch @@ -2,8 +2,8 @@ - - + + @@ -14,9 +14,12 @@ + + + diff --git a/Workspace/Siman/WebContent/error.jsp b/Workspace/Siman/WebContent/error.jsp index 2b048c1..92f160f 100644 --- a/Workspace/Siman/WebContent/error.jsp +++ b/Workspace/Siman/WebContent/error.jsp @@ -1,22 +1,14 @@ <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" -%><%@ - taglib prefix="s" uri="/struts-tags" %> +<%@taglib prefix="s" uri="/struts-tags"%> -<% String reason = request.getParameter("error"); -%> -<%=reason%> - - SIMAN - - + - \ No newline at end of file diff --git a/Workspace/Siman/WebContent/jap/splat-launcher.jar b/Workspace/Siman/WebContent/jap/splat-launcher.jar index cf88bdd6c612cddc9e62f01155678c1207007d6d..617fe5d8a0ec7cffeddae3e0193c812de323b6e8 100644 GIT binary patch delta 3900 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 P%!ydzp(9G-{B8L^d3zIQ delta 4901 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 diff --git a/Workspace/Siman/WebContent/jsp/toolbar.jsp b/Workspace/Siman/WebContent/jsp/toolbar.jsp index aa9972e..477281a 100644 --- a/Workspace/Siman/WebContent/jsp/toolbar.jsp +++ b/Workspace/Siman/WebContent/jsp/toolbar.jsp @@ -48,7 +48,7 @@ if (study.getSelectedStepRights().canCreateDocument() && mbar != null) { %> - height=<%=mbar.getHeight()%>> <% Iterator item = mbar.asList().iterator(); for (int i=0; item.hasNext(); i++) { diff --git a/Workspace/Siman/WebContent/skin/tool.any.old.png b/Workspace/Siman/WebContent/skin/tool.any.old.png new file mode 100644 index 0000000000000000000000000000000000000000..8b079dff6d4d76eb110316bcc8f77fdefdb15e1a GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9Ea{HEjtmSN`?>!lvI6<#o-U3d z6?5KB3FK=~;BmG-eDK-H8y8QV{F2O>)#26l@8Wtro&Jk0oih_7(xx%2c*W7G((t79 zm6-t_gU;RST$%@NN#(y_-K$ml?W#<4G2_HfZI9j_w9L_GT2(CTf7+7WVX27u{8n2> pVH3yxRjb2ZfA4NSWc@_^?P_gRujZHk%YjZ{@O1TaS?83{1ON!9Nc#W) literal 0 HcmV?d00001 diff --git a/Workspace/Siman/WebContent/skin/tool.any.png b/Workspace/Siman/WebContent/skin/tool.any.png index 8b079dff6d4d76eb110316bcc8f77fdefdb15e1a..45a8346286c693a483f11f2016d319c349eb6565 100644 GIT binary patch delta 1432 zcmV;J1!wxe0iO$y8Gi-<007{3J@^0s1!hS^K~#9!rIu}MQ)Lv#&$+j6d+9dVy19+< z62?ZYu(1&hjGhY#uz2MWP=!^M84<;Sws^i2IMuu7(~Om z4JoB#1Q=t`t$S;?a@*V9<9Tjdu=1kDoBVs5r%%rBIsfxK=YJ`}!yglCA*+VvVCBTe zeJmI280!ct{Gb5%fN=|J4aiuBk7nnx5DTqf$P~jskr4&yMu6zT0J6Lgr3N0~$x{9e zpp4aMsLG$7zO)49+AHbtJUbR=O@Itjnhx-X$FOU-hkp0E@wB@YM)!A8q~)fEf2(D6 zJPfb^Qw{r4SAW^l=R8#f%cjofpsBG*m^_(?#czK&2u+ty!kJ%NAh_E-O2No-9zK3Q zKp6*b9>1Z?x_E94Rpd@bi9;X)iP)&mr1%FS0|Z07LF1RR?;;*NeGCS-bp#kvoya5s zu<*CGoI1z!>IL&)X3jK{kdOru17!X*XvV~B65NQSQhyXQ)C7Q#7=q{eJE8e_3;7yc z9-cEx)Fc6T*ZO4MX8T(eFt4D3YfB(Y05JeDa3;JowKmDiA1*h-Io~-ETvt>Bt~J7` zUMIM}Y=yvyzD+!BivXBV#_r67jGOp)%WSTv_sZ+P8=K~8p5CwptGHSVAr~KFAq)>fF&7~SwGu1+Q~7#7>yEvK_X%Z#wJVTmKo1ubv`tfT|(62D{L`)eZjE;pYXQe#)vzYm1i@L19`B2tXVX zw~EcQRl~}XjY$^m>D&r!{mr^9Q4SmruB&&<2Y;6iT!$-PU)v!7hblIgE-G}4Ben-k zvL*mzlr%KN090;UfVCwbC1udq`7yQkA4dV;;G}92is0cW(x5VmJ+2{eZt@%!fY$lD z?6YhWQXtc00kbSJ&|;a$u?)&`7IKk4{acYg;36O4-~eh=imzT002mG{;On^!Csw=L zbbr92-K7=Tg+{WPOlal|Op-?Vmf4t>@|f6}G%2$b=M_Ddl)}2gS+gyM3N| zm9rRTK!`I4gjF24p~B%+9;a^6!iFhqk%iKXfEHf0*+7(K&cZhwKk`W~&;#B*!7)JM zJrcSBU%OtUq0lgfA_xitf-0~@3LL4sqJLXdKX=U|bu*V`Qi>eK6oUY0#8zREbq2g# z{5=^Y%Y6Y+3gOqR()Ta_EFV$~QI-Z4 zmat05F}@b6^0(i&<+j{h53a#RVGBzJCBlHX_Pu`#uC|OW)eo9vfbKWW&6h&2{60cf9B_fO9*f_7j?)3DTm#O6>!D}C-;MZ0-cMYQN*xeTo%oyg1yUj^10)^5ficK62r^*rCqw9L z3cQzS6?dB5>Mv}i<<&;88jX<3y?-r5zH3#Qv4HLRMenB<2A_p7wHJivy6-G5ECf^) z+MC0$>uujX%}#IEsTp``<2Tvqc88gFk;sOCv*3bjXk>`hI7fFWpq@eA`&?MIMF1km zyJ!e6xc7osdV*v3rw4A1FOl#yDO7-gIS*t)W!%IpDz8sKL7h~%b(k6&Jh9WMnh=;0000Y500d`2O+f$vv5yPIj7-faHbhHZTqVEZx@% zDZttqZ|DWRDs}eN99we%k@AM(?ZG*0F9ND_9Z$ - - - - - - - - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + - - - - - - + + + + + + @@ -80,32 +89,30 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + -- 2.39.2