From a06972eb33c0b1ba71a41ce762157ef61e6f25c7 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 18 Apr 2016 20:54:28 +0200 Subject: [PATCH] Continued: - line-feed is now LF which prevents converting - updated dist.sh for better personal-domain support - updated jar(s) --- .gitattributes | 4 ++-- dist.sh | 16 +++++++++------- lib/juser-core.jar | Bin 44272 -> 44281 bytes 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitattributes b/.gitattributes index dfe0770..17cdcd5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -# Auto detect text files and perform LF normalization -* text=auto +# Use Linux/Uni* line-feed for new lines (prevents converting) +* text=lf diff --git a/dist.sh b/dist.sh index b74103b..54fcb45 100755 --- a/dist.sh +++ b/dist.sh @@ -29,6 +29,7 @@ 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}" ] @@ -37,6 +38,12 @@ 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." @@ -44,17 +51,12 @@ 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}" ] @@ -69,7 +71,7 @@ do done -if [ "$1" != "r" -a -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ] +if [ -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/juser-core.jar b/lib/juser-core.jar index 0caa78e5080bd8602d99888ea80611142cf4166d..64d6386ce2697cadba83157c21855b90afacec4c 100644 GIT binary patch delta 1731 zcmaJ=Z){Ul6uT`)remS@2 z_d9>?J?GuIM(QA?avPSFXPu9c}TApF0sCgam?(ZNipdu*6X9>gzxJ z>R^A*0oUG5wZY_iaocb(xM=0(t^*B}3Dw*_CwPqPe+x^H`#l0Zf*rcU`S6vHPt#HO zPIwZHiF(nzD3-&WM6s$F2+;ZVmL*GB_3Z-MLBl(FXfx&u++MKk=l)8m zgWF;Gy*!@RylxlehlBQA8l{rMt>KmCeq8$Cx=0A39_BWe!&8qLQ?0Hgk?S6>>QfH! z&9lnkdG|%-Q06(RfOTA2^EDge zz~KH$|8{{Ei^{Sf*FG)@%W!a7x>rMCci@!nUZ+#-2gdqPj?@BAjnFthn_Y%M(`U?%gE@ zb>mPJlj$5^HxmAbitBiU!T~3F(Kx4O5EEem7&&#)rOCS z@71zO2#>1Tken44z|K!>d|4 zvvYC8?gam&vISj}5?ydGcRBbg)YER4bub~qrxJ%@@vNU~u6}&t*IvdWnp7G;c&A?AMf0EiZHGle2%=e~ zDfRH}oo}{7z@vrClyXb`v_wyNvy=fIZ8AaMw23d)aYl`Ha;kgxMz}d`;>%!J>fLl$ zCInHXDsc&nNiT2p%{~2BUS{J%I8_>eK(Y>pe=aFg_YfRPI^b?{4KJvlk!afpE7%AJ YW|a1hGFSRT5XKte`b?4bObCZ){Ul6unShy(NDO`?r2zOidf?cjb zxC6Z47*e{?pHRAlpTDI1Bw=t)eMaTPc~A8oN%$e_$tvMZ zuJh=ZYGa58*(2yrX{W2OP;2a`7(D0hSM;8qpdPI91@s`?`jm{RLfhMV5DhNs!G_R~ z&dG*v;zj1u``S%n^0(0sH7puGoF`$tAq3~s;nmY~Ay=)J~$!;R6cTlxJW zeEH>{QjYB8*9Sl0r}(j$zpqE4E_vn4rQp#q7P?-_9ev@@lLODjo~R@l+O9RUb->xN zW+4u)jxlKmKh=Rfy#^6)nn|yg5HloRQ6ZkT2>manHR%E-wzy1iP6t2ZpbE+H^|0Vj zp?chcJq9M26cK1DTisHj-5{&UAS=mB0%BBcMw7ne2L@@kdDH(jxXaMMDZ@me-d0fn zTn^oZDH!gz!rX+evdG~xD{u|0%HTEmYf)*%ng;F&1=vx zD99~fo7C&qO)^?kz%fxDh zLn<4c(A?#A`-&WygZUwG=EyOi1{U>y40&EI2R$%F{&HViF#bn>+RAM*V) zqkn8FK{hz*x5MYtPMq2^!|29VOf7A*LSm)`;rBUwrmX}w!Ku8?_T?Gf87#prcq3R> z);Pgaj*xhA_^uW@)&w>mIx;XgSn&WOANl?~`+5x_!nPY!kA%zR2WQ=Q#Vy#ebaDy8!Upm~BS?-bR#-@wAzpCen~AWmZ}pi75oRp-5ylI9 JRTvdr{srm;6xIL$ -- 2.39.5