From 13a68ad768e968af39b6a1ac5707b7299597a88b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 18 Apr 2016 16:22:45 +0200 Subject: [PATCH] Cotinued: - updated dist.st: skip wild-fly creation if path not found - updated jar(s) --- dist.sh | 16 +++++++--------- lib/jcore.jar | Bin 13656 -> 13647 bytes lib/jcountry-core.jar | Bin 9970 -> 9961 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/jcore.jar b/lib/jcore.jar index 30db7611e926667db756767de63cbcfbb784f996..87ed9490b120dc2fe98f03fd36e74bd541ee541f 100644 GIT binary patch delta 1049 zcmcbSbv}zXz?+$ci-CcIf#G`Nq=~#5g4Y@+c^s}j=AX{MzyQJ`lMm{OPmDEYG?_S2 zl+|1}$-sEx7G-9T>Ra+)>W>D9nyk*K2c{z!t-v%VlgeZR7WT;p7`edwvy7HdaZ@nu z$YchltC*ZX^yd9cCwah(Zhm(rFypG=Ek-b7lkj5*V}|H+X0S+;y$%N~aFzhW zTgM|nUVc%!etuhXC&sOr=lxDF;*DGSi#8~^~AK%3`J2d zkD}fQs9sMV-KkP2YU)8|f@48i9~`)owe+PKw}V9kWVrF#hHBDhu$~4s_Q~s^ChgOg zX3}Pw{7_qV@(+C;1$2j~qc|i5q)>CRuK~mrF$U61E14!A6c(M_pe$^pmz$WLenV-d{enPY#mVc1xF-t;u}wZ; z2(c^|C^bhIC}jp0Iu8_T5}iCzQf9KeIM?JfBO$Q+S6!O#JC%`v0fg01Y|N1aD%O~s zV+1j>+DMwoRT}Jw02%GcH;f>TcncKHmW2v)Pu?J_IQbq_N0hNN(|38Wlz^f-NC((P zAOE3feb4}(pfmoqnBF)660+w=65yptXkNR8;oNNqWY>#4I n*yIT&e&C>b2sC1kHZVS1!~(oofr=RzB!KWaI|DGKp6L{L;FA`KZWD$|8QMnAYHqR@z0w2~Gr+C+8lxiRp1@Nv%j?svX>&$;(q@?+AT zh+DEY5t2v9{h4vYUTdG88Eb&YR%BgS=N z@JKKbr>w}LCMt(g5a9GX)CaanGl&N`+e*Q3xZzB|hSa#A;uJNbu zzTIqCAr_Y?^l&d63@Qt$|E2Vk*}4Azj?gMjmic%lDqt1$PseP8NYrO43Ar=+P-u%`G2aE(^g?u)(>WV)h}Ja7i`u-h{QB6>wFz+z z61u7Ur4t+O&bC5(s1W!1+_KPlMF=ILCh=W37ut=6t6vvNZd(YEs55CUxpAl|nhSqI zYSx}GXTzmPC&J}eZ+aW1`Zg{mx))Lr)%dNm!^1)G1|@cxghNx2Hte?}!Wr@6JzS2c zhrcMO1C?sWDkpSC3vt)&YwHU((UnAv$;{zH@np7LiqZC1l(X(?q;q%C$&b-w;zUtabKN8Z zExOZYN^ z8QGG(tYF4(xwp(9#^l#Z7N{o~ObCHfb%;q@7^V^=jOc-$F(I07ZX5&F7hHt16@b@^JJ;3(FmX3=ANw z12>m}VM!x1+hhYZ37})dCeKxc7`#SRnu%2cD6BHsPeL5SjdHE;6D?U87{D0CtkB8& bY93&>RjElcJ(U9*Avt-2nho1!C6GD*X>yn% delta 503 zcmaFq`^lF#z?+$ci-CcIfnm+co{78~ysKCCcsR~m+g8B9z)&#J$&b-&;zUtCBi+or zlGLKS#2nou1JjACm6<`xFUo_d&l(_VvK*r!m=0nz1Jm7%7GU}qqYa4O%*w>U0%i!X z{TBo?gd}_!!HguyURE&UliXWo5M%NqB@0xiOjcJm1v(AL0TlxUpo2YDd^^v1l$n76gf-x57#Nl`GBN?}k)7Ni#Xi|Y zRS0aCr>Zm)4;x&#OH~YP2ESHI!%v`I5Vk}ygHHnJFzd;`Re8YrxzwbY;v^>*N?K$1 gtPm*mPHr-zysKD%H!B;+6kZ@?U}0dmqXgms0Iy4ohyVZp 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)