From 32dbc51419c19e9fa163b477e0e0dce53ab671c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 18 Apr 2016 16:22:48 +0200 Subject: [PATCH] Cotinued: - updated dist.st: skip wild-fly creation if path not found - updated jar(s) --- dist.sh | 16 +++++++--------- lib/jcontacts-business-core.jar | Bin 65125 -> 65116 bytes lib/jcontacts-core.jar | Bin 21780 -> 21771 bytes lib/jphone-core.jar | Bin 29311 -> 29302 bytes 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dist.sh b/dist.sh index 54fcb45..b74103b 100755 --- a/dist.sh +++ b/dist.sh @@ -29,7 +29,6 @@ PERSONAL_DOMAIN_PATH="${HOME}/personal_domain/lib" # Generate list LIST=`find ../*/lib/${NAME}.jar` -LIST="${LIST} `find ../*/*-ejb/lib/${NAME}.jar`" LIST="${LIST} ${WILDFLY_MODULE_PATH}" if [ -d "${GLASSFISH_BASE_PATH}" ] @@ -38,12 +37,6 @@ then LIST="${LIST} ${GLASSFISH_BASE_PATH}" fi -if [ -d "${PERSONAL_DOMAIN_PATH}" ] -then - echo "$0: Personal domain found, adding to LIST ..." - LIST="${LIST} ${PERSONAL_DOMAIN_PATH}" -fi - if [ ! -f "${DIST}" ] then echo "$0: '${DIST}' not found." @@ -51,12 +44,17 @@ then elif [ ! -d "${WILDFLY_MODULE_BASE_PATH}" ] then echo "$0: WildFly base path '${WILDFLY_MODULE_BASE_PATH}' not created." - exit 1 elif [ ! -d "${WILDFLY_MODULE_PATH}" ] then mkdir -vp "${WILDFLY_MODULE_PATH}" fi +if [ -d "${PERSONAL_DOMAIN_PATH}" ] +then + echo "$0: Personal domain found, copying file '${DIST}' ..." + cp -v "${DIST}" "${PERSONAL_DOMAIN_PATH}" +fi + for project in ${LIST}; do if [ -d "${project}" ] @@ -71,7 +69,7 @@ do done -if [ -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ] +if [ "$1" != "r" -a -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ] then echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..." scp "${DIST}" "${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}" diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar index 004e9afab5fcba8dfb33ff8e004bc9d43ae76283..7db7e0a370ce73c0a9b3970b4e195bff2a0528f7 100644 GIT binary patch delta 1261 zcmZuxT}V@582-+8($u-O*~Ij?`Ilz6VPZOoEw?l?1T}98ys-!jGz`Hm(hLdFBC730 zOvDD~^yDLcCorr#e?X*X62w(>__#NC;_k9;@aKJDrJ97W277h0d2*yu|vHhEB|t z930?|pg+%*qkqmh(Es6%qqop9^jGN#^i#9~y_PT4vHVI_C;XUUr7aWkclN+tK2Bn} z2YEv@24k^b^fF?+BqQ4F-hGJNw*_RRzx`G3cEbi9^AW+4>4IB}6hSHtD;b1dqgM_njFFMeg+M z5=E~5VRz+M6(N!pA=l1Ff#-wD?f3ds$o;ukr@_GL8^UZ@_LnGE4~45m5(S!8g`^3# zp_bOh{Mssx>iO_}!QiUEEy3t&YFgwb)51H|lHU#;IMy=rBC-{mKd9hWGkytH?^qMK zKK7Oc^IVKtS>40VK1#~4ctr)t>+$K4UF0fMGbo(pGoZF97FyQhQND9spp7!@8&<>g ze>CzG8ZRiEnlWo4MuCFA0u54l?aeVo94V$WE3~XU>!%=Ms0F6fBOPRby+;Fi8wuE` zeM6wnViE4#NJr=~gL;heNIC(6A*N=NwX$Cp$WC`{%7b<=wA+TLHfk>{*rLH62raBw zKX+RoM6%LwgM>Wo>MF;C^neKq)&vCF+yKsoG8hWTvf~VT*Tx_d7%yuj81Ep}<+lzR z2$9UDkQ{H98)kQ4RBNCkD39k13iQ=L=tu{P!36xGGMrPB%_)RPc2c2p4Rl*)u&d@R zf!2*-s&Ci;r?+Iqc?P#mNS6hkDJ>L>GF&AJ)HK83qhJ-|u}J;st^PjtyOOL}QN#_i xqWmY4ye-fNUUt70xVRnKD1&AfS>1g2{9O<8+j4;w2Iu$?w(Vp_zxPXu{{REdq`7Z6#sUwI<;*+=j%GHnWCl^nxfWF^NkT^fyBrxdJvY0C{ae)gHRE5orv~F zW>T5-Gz&?xq$Hsz9Y`w}$f^sGlkscqm2$9Y=1#t*Jr$q!lF zq>W)>p{$|)QQ0;dG7kcPBS?cfsizp7zO)n-bHgzhQVh4uqSGKn9ghAq1n zfcv!6GaX2tdRB)`Q6B`wkW`VMiFd3!eWNW!}l32m`#pQ zG9yi}e@2jHVpR2BwZwkwq>W!rJ#!?4V!5pnA?FV_iJWv?Sf{HQZ}cXFB96(q;erZZ zJE(%AKRhwHaJ%0LwRrg`QkmqYAglHP@Gi({p8f}Z*PMy*BZMM_A@ZSr4-MALYOxD* z&6(r|9h}o8!{b?L`&Y99SC=93!=ZS!7xc|aQ`XjLPIGEPDAE{yWihVQvO5r3<~&jD zOGom{jiNpj$xQNdFwN!SIca_hTz?f(i#QihE8XD5PpMbQgT4Kg;(rW90zzWD+wwMa>%~urf?d3- z4@vZzX)Kb;T_$~2G)D-aGwuvcZN*_y0^)Xxe?{q5uQZi1Hk E1CBG)Y5)KL diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index 8421ff371fba35b6b49565f9033db9129f9fa80d..ad4d408e75d2f4ff70b0f64e5db0987575c01918 100644 GIT binary patch delta 507 zcmbQTim`hYBX58=GYc030|x^GL(`;*yc)cJ8z*@ju0H0U4irhB=;X&}GI63PtGRBH zf$_vG%FG~Dx8%Xp9}N&SS)I`cOvf-4r!%*?0hj g-6l^6f%tVkP>9nPD5O0((pP-)zYqboiU5!~09X!>eEmfA8Z(+r zoG8j?q??&nl3J9Pn4_CyU^;QNGBYnw+eLXW^;rW%O_pOc0@J~aR$zJpqa&EU!e|Sk zH;XX&bAlOZ+}>avo3|K$;R1`Swwn!+^7J^x0u~YT&0}T;I&E@$fCVp#+a{k0Fs%og z=K*vi9I(Jy0t{~*&jNY*Md|th-i%Bl%n)y)>)=Jv@gAxpw<0+sF)uw8uU2t}$qj)# zOj3-K9YZ8_@L3{{Vu?Rk!{h^;9C$UUp=j!XXcCa-pX?FDqk!%WB^1RMK#El+&wwg? zSGw;j2PZI=fmjEwkbz-IqW}}g?LepSPks|51PbxVjKR`ON!(Cjj>-1HvS8tOpzsD` zu&{u%=;T$w5Y_vE!prU8!dxNZ@*tuI4YTY8nSlup bh#gSW2>AjH)SevRD?a&ahyYt-07w=9-+Y-Z diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index 412151183b1e8df79a1bfcf16d84ed0aee672d82..f61cf885eebe4b8c1b174e893607135fff74914d 100644 GIT binary patch delta 1174 zcmZWmT}YEr7(UZg>$X<-nky z8|Osn1P1WJb$< zt-`cf%M)ml8}mi!7-o-L1HThyb724{El7SWTIngw?KFsals4gHHn8w{;CpBN4uibk zBcI^>7YR8l;bGnIOvXdrRBgn=tfgNdA>|uI11s>Sp{aI4*TxWs*ckr!I)G5HzkurKil1- z(g9v{K&q#hUls-!G$p}0b-?Q$GeUC=+7M8Xnw>fcowFL<)DQ$?-v6A{={Q3aC;jQ& z12Zu(Z6T)8c@BHQ9v7at%}SZsEQfHs0zF-itF)a%{8~j|PZ%LDA2_^gxy?^L%nhEC z3E^?FFqx3??2=(evm0$LK5dG>V~@sT=e@?Ww@r+E5QY;zBtE+TV5EvE@(AfvCoGIu z4QnMTlvs;kDq+TkPoEpl4^u*T_;d{}1s5<8u)?k6UcB09Ql(ZK!a-ULVOtrbQbOlT z%lzqPrh%c;Y0$7?P}4XWb#A0oy5fXTOoQP%h0CLt%{zTVN+}^cygH3B7m`<9C2%h( zG|u#@)Zj;H{zlDlrwDME_FzoV0gU(PDU8cBjIoAYPO{Qg zQd*g&BD?g{wV>eUeqCD)Zr*CQBr@n;V~7~u4i9dIJ4zDSI{KQ5W=qe5NgY$}@HdHU z4!w~`DeiY;>ciN)EI64uSEF!0;6-N8X$Wj*`UMw4rs4a@Ey_<#^dw@Gc@^oR$R$mK zZo+NTkIV(AmeKX?1Ac zOHIV9b^SM-Llks~D8nHmULUBFDqfK>X|T(GVGZuETJ7Ia#a&vQFe?d(i%okr>vc5y zB1J24e{in}omR9%BpX5pi&=vv`I`^)oC=HCW75~G!PZ@P3Oy%3!b>@W*>wn&wf(SD z-wq48Mr6O^saIMh)eVa|c{w4=U?SgI7G&ET_IWFC7yPy)dzZt}4ul^yhaj16 z42bK@9jb2`r-XV$}O+EMuztQM}|tgS_ZJ&B`yCEh2b_>IkaKl{%pgot(CAzdD;ko_=M m-vC?1Mik7vd^)t@B1Ei{4#7l<3)