From 76846e55d7d28ea3ba312190e89accfbe4d922f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 18 Apr 2016 16:22:57 +0200 Subject: [PATCH] Cotinued: - updated dist.st: skip wild-fly creation if path not found - updated jar(s) --- dist.sh | 16 +++++++--------- lib/jcore-logger-lib.jar | Bin 2533 -> 2524 bytes lib/jcore.jar | Bin 13656 -> 13647 bytes 3 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-logger-lib.jar b/lib/jcore-logger-lib.jar index 687b0dade631544f0021d8203c2d4c12252352b7..01319d9619862d9bdeef8665073d269d6ad44707 100644 GIT binary patch delta 415 zcmaDVd`Fl!z?+$ci-CcIf#FW$q=~#5ytf-Cc^s}j=AX{Mz>q%C$&b-w;zUtabKN8Z z~ucuqA6aq?yivgbXJC z)1VgPSS BYefJ6 delta 406 zcmca3{8X4Xz?+$ci-CcIfnn9ko{78~yen7scsR~m+g8B9z)&#J$&b-&;zUtCBi+or zlGLKS#2nou1JjACm6?I+CSH^WQ=c_J)MPnEGcX;_XalCFF*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;