From e4c53fc0cb594f460236daf1b4cc70a30c76bf3f Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 18 Apr 2016 20:51:39 +0200 Subject: [PATCH 1/1] Continued: - line-feed is now LF which prevents converting - updated dist.sh for better personal-domain support - updated jar(s) --- .gitattributes | 4 ++-- dist.sh | 26 ++++++++++++++++---------- lib/juser-core.jar | Bin 40898 -> 44281 bytes 3 files changed, 18 insertions(+), 12 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 3f4dfa2..54fcb45 100755 --- a/dist.sh +++ b/dist.sh @@ -24,6 +24,9 @@ GLASSFISH_SSH_PATH="/var/payara/domains/domain1/lib" # Remote SSH server (password-less access) GLASSFISH_SSH_SERVER="www.mxchange.org" +# Windows personal domain +PERSONAL_DOMAIN_PATH="${HOME}/personal_domain/lib" + # Generate list LIST=`find ../*/lib/${NAME}.jar` LIST="${LIST} `find ../*/*-ejb/lib/${NAME}.jar`" @@ -35,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." @@ -48,24 +57,21 @@ then mkdir -vp "${WILDFLY_MODULE_PATH}" fi -for target in ${LIST}; +for project in ${LIST}; do - if [ -d "${target}" ] + if [ -d "${project}" ] then - cp -v "${DIST}" "${target}" - elif [ -f "${target}" ] + cp -v "${DIST}" "${project}" + elif [ -f "${project}" ] then - cp -v "${DIST}" "${target}" + cp -v "${DIST}" "${project}" else - echo "$0: Target '${target}' not found." + echo "$0: Project '${project}' not found." fi done -# Testing on project name -SKIP_TEST="${NAME:0:9}" - -if [ -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" -a "${SKIP_TEST}" != "jratecalc" ] +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 07acdec300c73fda85315fa9de7294503405372f..64d6386ce2697cadba83157c21855b90afacec4c 100644 GIT binary patch delta 4082 zcmeHKdu&r>6hHUgu6HectS#Nj+P&BY?b@~LHfG(sJY+9$I79(Kt1HW(7KA~FqCmjc zAE@gYY~WxJi188U0~O7p^YMp96CuVwe8j*XCcYwQVpM!g&-dM~h1k3kCQ*#jNojcoYPx` zT23Dq=7~oVct)sZ#3eQ|vRYi2aU{_M7yJ}r*i>NMyeYadFyV|D9Fg33QnYhpUx^`3 zSBq{u)ixbhOM3pjPFl>&j!1R<^LMF*(Lp0+mP9^)}1X`Oqh;#gH0Kvf#nn-8DAw#7MbI{`P*r0E>RqAyJ zV2CBX-H3199K?pL>DcDE1G~-F%rtiNMDAF(D6(N`#=2*-CSrC$;$^h3wwE)fwF@ARH&7I>=8EOnr3w3yI>+GV!DS&nN zl-J88UjRvqorU2#mqmYXq_8YM*Lx*9#12c@dxUU|B;1b8jxU`a&!1z2d>>L2JT-d%8;UQ2ee*!-%Ehs^ixV zPwU#{-&zGQZH#txZ|aF|jCQIcc)&WZXzB>IP>$V@(xNO|IUc`lnHN~QbOh(9QJ0C~ zS;bRAuN=ko_~U>VH`wd~sv&i9Rq1NPQ!RiVxJ990H`%7o6BL%ojvKHh| zMqN2i`E58awZY_VIVR@A>dS! zmA~*V@%WyWTAA9x;~y+})5Vn@i62d4f{GrSnG2eC9n^B>n}?s3C8~|Mzc<8sTKu@T zflXj$BEV@=Lg_enCFb()_Y!TKW?={GIAhqt$g9}S$XK5fi~DLXZf)=C^Wdma8{{$A z-YSUGC8e7tSE?>}Ce>}_Cj-6@e=cHVf06HU3Q9M@RG5NO!l0Cg=lTqMk+dFh850Gt zWv@Peva|A}D@AvR0ZZ}uu#8XcHRjPHmYOC;y|8l|zwR~UO*R@xX|V+baL2x4 zJiOafa+ytgR4Us@MLF}4eNOQm4Tk$YxZyq%n)|KXTj|MH@-13wn`ktoQ~{3d9LC1} z>)Fax{k;m}GSZP|(`DqK->Aj!`uR>LI(vYS3cucz#M`Kqm9cfe#_UgYQULQ+_}^_D zzun>+w>?p{CS%{3k;K}PwT# zkGoNqo0}3pMdC3Z7nc=e;mSb+H|-02`IL^#vavvAx*|y64h||m^XJz$5P*%a3N%#7 zEk5Sg;ujt>bH)`u+5f;#YY5E7bt;ASP*Nc~wX(H?PBFWd=fiMCCcZzY?Bg_v2O7Ef zWTnGADKD}8pi@jNOJK)kd zsg&?;u9Tmq!F7jh?A6(E$SH<)q@-(mrs1hW$^&qkrWQY{ObwOryI3^j6wmG@kr!93 Vu;3FzCX4{S9Ji%eDXj delta 2063 zcmcIkeN0w*45Eqx2DH|~}{^5+k zW)>kjf#d#A11&8KMsXAIBf*4`C1%McVMgN=T{iv0Xo54FCi8<4&%Lj7z9laHW0TW! z?m55nyXT#I?)~Fy@$4B<4mC>#Ge9c9joxGZvRArJ${&`lky^~-YT3&at`{n~eq0D} z{kG5`lKZM~FH>%@o~btR0j8EEFWMz1$9W|`*KMK~=Nc6ZOJ=^Fly+*+`}i_o2y)$H z*v|CyMZ=E*H$FDD8|}Tvntt)U*K-4?PLeJ7tmGPq$QT(hVeN<=kE%`_=&iv6b{W5v zM;Ly#dFjf$2*AXD8?WS^UzwRDjw)Dd1_NZLfdn}waG5|gfg8JhB_?>|cc_6r-xaT>23RrDY$0IK?q``nM7rKp8RmD8C#W zw93-Z#Fj}b%HyoH0?{epOpsQP7ATlf`aX#7k|6@)GjeAo=dox2jR)-k#X%?0^hkc= zzF(;vCfivfaidbL{9E(zf|7=x?XBXCd(qjDJeHy?HFdRlIP5A%c{G!EE#}(V`M)-5 z12xKbmqrN?_|J{1zDuLrYgUw7)KVs^jZ(04G)Fg{ueeUr+)uj;TSPwJ&lk5Cw2Aln zH6z_usTuW~_DMW6x%rf4wEE9!#`?e^4KrGQli#!H@UDP~5npbdbMvIg3$YaDxW6mY z#vQv~A2f2~ujB8SB)abyAM~>ek3S67u>g99D!6`ZNV~Jghqm$c;?RR!mxLc>clM=l zkg4(KFoI*0hrV!DF8;g_Z$C# zH{yJ39mDJ1E*<_G3*mzdqkFG(7>|`OKK{y_u^O@cgoS^H?q2E=b~q>@e_*tV@#>~h z2OCl}m`pS3VLd!_LKSa0$?0Mzhz}JO;OTL#7fTds$xei-nVZ*e`Q~p=eNGP&lc0`# z%B_LNYWbmE9aF`n{DjMf`z!2tVJw4(n#WbKU>y%FR9mrcyo|eN$^Du);V!~gPiko2 zNmZ=fkZ>#bmfw}EahO7>8^;{$%@}g9q;%#k0QOr`~h|Flo?LeROj&{fUWU z{)wM{Qt{m-I%g(3bl|RF0_?$`CNfzAS0+?(_F?iCqrJ_BJL6jOTH~tNeSo_!ss@b4 z`4E}rrPgy+04AGs#GdDp*yZ>dUPZ;F&{x~20w(o3aNr0BcNnZV*Js9#$qb&*q<-;d Z$OOPdpYUxDB?PS=@IWDL-P_OT{sv^8LHYmy -- 2.39.2