From 532bbec896b1845b20d450b1f06a3694f34feb17 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 18 Apr 2016 16:23:48 +0200 Subject: [PATCH] Cotinued: - updated dist.st: skip wild-fly creation if path not found - updated jar(s) --- dist.sh | 16 +++++++--------- lib/jcontacts-core.jar | Bin 21780 -> 21771 bytes lib/jcore.jar | Bin 13656 -> 13647 bytes lib/jcoreee.jar | Bin 24632 -> 24623 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-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/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;20B8WjBy`d3h7_nf0)9DvOV+bJ{^apnO3u;S36-cOO^he@hkILf)I^f7}5Gcw5#vgbA+wFivD=ArACN`4@Pk_3n z6(#vreQK(i32ld-NpIQ7vCiQ^4%d^a^9qJu!T4NeoSQm3K6-vEvnSPt3>7ln&CJ0H z-_X9-W{yffqJ%z1fIO!?^nZPg3QC?*nvJ{mfP9R{B@T*06O>}iTzD;&esVCIY5`MR zE(viS_h44K>NOgara(?wy^Pt6rMQ)T4xog!N=Xe4V$dsuGENhL&9oDy61v9SU!z^2 zJwqE^|7hP#@OXhx>%d*RA6!Wbn-jkqK5jE1MB`|64nlK<4z1MegX>8P6FHyc@l9ST zg~6DT59&zqctVhl5`a}vCs0{8A{#1RhY*cpig9yrJ0;)$ZxW5~D*Mw0q9`lbGHl=Z zDqS8LJqqe$f7vcI*n?(xDawjIh&l`DHD@@nv|SlQ#@IB#uR0Rsa=!9*uNMze_%Mfr?$ zGxJJPi}Dh4bdwBBC$3gz2CAEQQ65Zv)&NnHE zn%yWGR8TaqFin0KX#{rCsVHeCHxO5Ca)2p6ADZ*EqNSOpF@a16#lhs=Q4rUGG~I#; zi%yn}<^r1qQmw@dRIM>NKN_O44k(ld5;B;4I+_dYkNoZH*mc+$7(mzr?kom|C5<~k z3dJYab4X5BjS&JHX%!>QWX25)2aC!5F+%d7aQL6mw>F;{7~DYYjG}+(T~-DL5DrDrreXpOBJIhR z@erqF#Yr;?+E1ObKhCfA4ZP8LoOV_OvtG7kWA?;b<| -- 2.39.5