From 7079f04fe3de5ad59617f67f0b5537c1b9f9cf71 Mon Sep 17 00:00:00 2001
From: azkahi <azkaimtiyaz@gmail.com>
Date: Wed, 30 Nov 2016 17:16:35 +0800
Subject: [PATCH] Added AJAX for checking user status
---
.../classes/org/IdentService/DBAccount.class | Bin 1337 -> 1331 bytes
.../org/IdentService/RandomString.class | Bin 1399 -> 1393 bytes
.../org/IdentService/RetrieveAccount.class | Bin 4665 -> 4635 bytes
.../classes/org/IdentService/login.class | Bin 5940 -> 5907 bytes
.../classes/org/IdentService/logout.class | Bin 4712 -> 4685 bytes
.../classes/org/IdentService/register.class | Bin 6049 -> 6016 bytes
.../classes/org/IdentService/tesKoneksi.class | Bin 2237 -> 2222 bytes
.../classes/org/IdentService/validate.class | Bin 4753 -> 4717 bytes
IdentService/dist/IdentService.war | Bin 894186 -> 894126 bytes
IdentService/nbproject/ant-deploy.xml | 41 +++++++++++++++++-
.../nbproject/private/private.properties | 10 ++---
IdentService/nbproject/project.properties | 2 +-
.../web/WEB-INF/classes/NewServlet.class | Bin 2319 -> 2304 bytes
.../service/MarketPlaceService_Service.class | Bin 2973 -> 2964 bytes
.../classes/org/saleproject/KAA/DB.class | Bin 1344 -> 1338 bytes
.../saleproject/KAA/RestAPI_consumer.class | Bin 2897 -> 2873 bytes
.../org/saleproject/KAA/UploadProduct.class | Bin 6429 -> 6384 bytes
.../org/saleproject/KAA/tokenParser.class | Bin 1194 -> 1191 bytes
KAA-JSP/build/web/catalog.jsp | 39 ++++++++++-------
KAA-JSP/dist/KAA-JSP.war | Bin 2214110 -> 2220637 bytes
KAA-JSP/nbproject/ant-deploy.xml | 41 +++++++++++++++++-
KAA-JSP/nbproject/private/private.properties | 10 ++---
KAA-JSP/nbproject/project.properties | 2 +-
KAA-JSP/web/catalog.jsp | 39 ++++++++++-------
.../Service/DBMarketPlace.class | Bin 1389 -> 1383 bytes
.../Service/MarketPlaceService.class | Bin 12901 -> 12867 bytes
.../Service/RestAPI_consumer.class | Bin 2024 -> 2006 bytes
.../Service/Validator.class | Bin 5876 -> 5846 bytes
.../dist/MarketPlaceService.war | Bin 56249 -> 56909 bytes
.../nbproject/private/private.properties | 10 ++---
.../nbproject/project.properties | 2 +-
31 files changed, 146 insertions(+), 50 deletions(-)
diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/DBAccount.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/DBAccount.class
index 0764e61bca3ad7615aa56734c4f6f4559828ffa2..2d51f58022e2e6575fb5c867ed9b7aea3f625752 100644
GIT binary patch
delta 172
zcmWO0yKaF|0KoD8IfHYYoCt$3nyBm7qIGNCeHI3>G&X5EXv8H%JcR9=Bz=j-R6`%Y
z8+8%(-|+i2C*xkO=RcrG-w@<Mk<_FNX)>CuCZ}->k39L2<P`<~ojz+`3?<5nil(Zl
z{kTKn9mT}=YI&pX{flC{VTsYSM2HH)U(?;x*{tWzcr@tkKR#F6*>a(1S=w~GcbW5b
WEj`@RL4M1S(QQRQBZ%K~lEe)iaUJRa
delta 153
zcmWO0DH6gk06@{7h$PKKzzIOHw`^tK3ltC-BnRRGv0Q?w0>J^e4xXX*Kl3yDwCU&f
zdIK>hOM!-_X=qtOB17BIF?20G`T>$yGYA+mGK?(~rka^yu30?NvrxI_!FzF4OUH_}
o|B6^`9Ay$8%97eTcI^E{Mk;k2IA%9_m&J-nG*yG3mY+!Ke`q8ZN&o-=
diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/RandomString.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/RandomString.class
index 3f6f8b0e82ff50274ff1c47c3ed74bd3fab0ef16..5506ddb1ff96612a3cb5f901bd4996b8337964e6 100644
GIT binary patch
delta 318
zcmXAk%PvD<6otQi9R2He22B(RDI!|x)}kotTIz0MXmmu>rI(}?Nk^TEfuuP@@d!-J
z3_O6h@CZf{L7YDZ``as7YbASs>JMFi`+a!@QXFX7Nh&5Z7ReUEOe&@nDNTT6kZH4L
z3}y||nr7xqY~EnOv@(iCO^78EST<@!v8q@TRJB$-E*GkTb(9qX6}NO!E((qMgV!sk
z-i<^h?mfv_F3Y+@mJNp-F^6t89lGdr=rGt~TL@ja*KVTVmhy?itIByPZ(=*9wd=6Q
zz7T1=N1kiez38y`-w9D-UXOh#gWj#(*EB@jd$jK|!;JV|zkmO~3X*1&F~2e3PaF0R
Tt%`tr(e{mHmLDJYEsMk-n<Fxa
delta 308
zcmXAk%Pxaa6otS2_t#U$ACVLlG(l9UYpbfLYt{WWHzFbus)>$_nuxKaIYTjKZf4*C
zyoE<Fk_h6Q80@uHvc8?{{h>c~?d|vF707a+X(OYU)OchXX(g+eQsgvYG7+Yo=bg+r
znbkBf=dgm4dAGHoSk$zz<bY+DRuo0Ws-UXZ<>SglRqzgrLip<F@}yE0>a~ZEWlXo6
zTF;pqNl3~($yslSwSW@q0UIO(y4VcpBo@%_WQ%Q+_F~ODj@b>^V_%5Z-{a3!?_P95
z>`%e~Nz>t<%b>aSdqP8`%%gu-7-qzFefH}A6d}(jV|Jt8P89!#CdIgX5&gz<X7LGI
Hd8GdUBKs}$
diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/RetrieveAccount.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/RetrieveAccount.class
index 363e8d3f625a49d4ad347359a16503cb7b9ac163..00759848580227861e21adb044b6428eb105f057 100644
GIT binary patch
delta 999
zcmY+C>u;1*5XOIJx4Y-`eUH#;LdX&lFc7~e4Use<sRaTh7@Baa++k_yLKj<Fx(h7|
z6u~P+L0>@-Z`>3VR9G$oic;hv0?J*yfZU<sAK(jhPNTK`aAuyFd1lU;IkT_Vx?T+@
z9_~K~^rP8hAd3wz`HW_X6H5&*dyL@~!>fkZ46hsBFf7wFdRWI@?(~~Jqj<}(!Wk<K
zZyVlmX@TZlk1njztoG>Y__G}KJ;NHqTIYJ-YhWE8_|)*B;UmMxK6CiQr<V1G4Tg<|
z@y^<0*zEMDhRIHUW|(S-8>Sgb4P~y_N_XiN!&X;LF8^Hfg~v9wdwj`P*?i3ohjtn=
z9s}5A*saOhquHAYsica1quHm~ukecMrzdLC$?DlD%>m7~nZ{6|^1jm?)O@e`A#*vL
zr+Qir(PTNykBZI(J%@}KTry!~QICprRb`>&2u(p=WciavIc7Odogz|@SJ77@KRH7e
z<ds#I&o696|E8P>nj^93&zw}mf^FegZ_6o8E261%X?ku-5gIYv@(aIe&REWJ&T^g$
zL2>k%!Iq0$vi!zng`HPgnJkb0mlSC=Ex+@J!cWxKBx@7#bh0X8`IEmaS2%6CDz7~o
z9r(oGmTS~$u3K(!Q*+C5n>&`f+>>_<9rSE*(GbhHOn<#1I&pwzlxDPMjFxX!BK)Bu
zhRJCm7p>{YXk&$22oY`z%lehbiHh?%#*!uVAMeyH)G(e2cr;SaL?+?0nkptUMYe1`
zWlR<Hh<xuj;(|J{mtv*~>P!=ZC>4|=<I5N36nRVm_nA&PTKH#3h)=eLqs(9?+3G1_
zRFITtAC<!_iAH!js(hZOGHA-_9j;<_(45mP-qujp)~>5HHJUjZ0ksfoA-hA{|Fhh9
z@*nVMD7Qnesn)&~Y0+8C4a##%y0@Q2`?z8rb-{(){66iyAsG)cx%s>x`Y{wQinSoc
LLKaOzrD*sEOGD4w
delta 1020
zcmY+CS#VTE6o$W^B-5RHTbLnL6q2GURzdLuQ<M}>A*@L$QbZ)81SKS4Bonfc888ww
zf}*mCaAi?I0dWNs7%;41N5!x&BB(4bpaO2Z@M1WZhmbtnK7XI{pXKj+mUrLYz2V6J
zJDPyL+;$kqtA<%FukpHnykVH_Fo(H@d4~ChHw_C6Z)p}fSf9Jdx1P(}EH*6hFG~%}
z4Da}9?`oDibY_KSr9&5=U*S{VGrVtD<-1lp4Xoh<m$iIo_{i|F%O`y5@)_$4>kS(W
zh5qex!xz5YXc*_)O@{G?Vnd0c)G)y>w$yLB*^u<hN%Jk5tqxz(=&+6L>Fi*qk9HY$
zI}D)7ut$@+SF<k}P%)JyXusxw=AaC&aB}NPqcw?GbyZw*NOL$jE0Ci?D>YwfzSexB
zIU-GxM^hrIr{r0_rP*?nV~UR14-L&9QZVN6+^n)hWkrtEv>d0|>y|dJ%Lz_OC(9}7
z6=~U#vOYPM)6{!SX`O>-7_7+f`lM$Jvz+CeqHA^S#7KF(x+)TnRn}BQBg01JkH{}6
zkCrAZ-*H|Mj3<f{Q{sw1{$rN!xuCgd`GFs0PRmbR^7;n*hh$>QWv<BBmaF{i)dwHU
z`h{N=ZnUl@RvRr!#44kf-?(PE&Uwr4GVqq*z@C3t{-j=W!*Y{bn!hZ6^N;0U{*&f;
zgB~58JJd2JnW+~93rA|6(2UX)Xr4sL;pWNlh<q)C(VF&*R#r+20a9ASvXi6b3ySk8
zo+ef5r*_B;G!!xxhq=`84A0`Sgi6LyB&)ZY62=R9fc276ET{vG3>R+^9of$yN(F`F
z5A|b$pfK6oAj)%S;h$up_++6tOc^oKRWD(bGfASoRfr0Srtxr4xze!8TN~<;QcaE5
z9Lg+e6*T#t>ROF#OhO}I3UqBDy`Aj)EdP0?-l0<<+)nHB_jD_fi0FR7%L^BDYx@>$
m<BDmrIgR0dz1w;NOqbjMFY=Pu3=|D=dpXVwW{yS0dF3tx1K-jB
diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/login.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/login.class
index 4bff7d5e3e6e7aa58fa413b5f7b8e0205739e2db..01827fff713311155c8add268b57017638e4ba7f 100644
GIT binary patch
delta 1463
zcmaKrXLM9W6vuye+f3dLB-sQ6lmvpP0c7=n9zBPH1p$wIKo3z4`au>FQrv7pc0*Cf
z+CdPbc_?7P4vGae*buP*7A)91*elkE*jZ;HMBsz(yt(tAx&M3TmYFp}{h`^-yVkA;
zhRYC-2`o`8^$4&mkFi{<xh_gI*E?~8X1PZVH)?Lu+^o4pbF1by#qA#XEYYlR^U5gG
zxI=TNTddODrMcUg-J`hIqc^KH_i65T9v@J&ds#|Y;<1JYqs-$W&0Oc;VNHwX5zV8T
zwVKDG%x7Jc1w5{)ck_BDp74nCq~a+zKkdW@CpIcJc|60j9>aLfvxz*f+3ezZLGz-U
zU(&qnTyD`!dPVc9XM=c6)8_FyZ@9%O7xJ5$w={1n-ch{k@gDDce8AQ`w(+4uA34__
zYd+EVn#HbcpK3mH2YjyhqJ5&YNuMtjUn#y8ywS6!RyAg78&YY-H;V1;dBG{-eXICR
z@x9`Q_Lfj@kstk~;nMzwpXf0B%nl)cME{e<kE)n->gawonfl~N!!LCB+rl%m?BrL&
zZ?p>G5%HQMt?GBTP$S|~8Y*Xx>_oe5{$Qd|RF{~Mh$j=N>Uc#>Q^U-}lw_6RPyP}L
z5{-??+NlW_V7xBfkg`6TGt&+~#_%^CLZ61F>dyUmy0*SCSrtEJf<HN=V~SmdoM1#G
zU?eCZe@EoBN+V&37*V2)<cVh_Dj_3Ax(Tt)Aeu9^$@r*5vMN=XXfo1W@{JTop^=yr
z?ct=SC*u{h^;PLiqP|f{u~YUioFP38S8|oVT9qElPB}mbmJKO07WNVXW#vYCizh^^
zU8Xs0x5ke%(nk(da*&a}QevdkR#53lCH;)_r&URrkpXhBl7U7Jkwc9fCgp~t-=cfv
z4{{ZiInMiFp~RPPN&5!fq|O|xn5L*!)F^we#fs<{D^9i}M<GhFFQbbU%-Nd~>{8pu
zS8GSaZq{)QA(HK_1$Dt}Jt;hvv6%)MiL#tcOs5IMO4gCK+HS124<}<$ceZjV&CIZO
zZ#%P?X-5GamOtCt7RoS=;A|!nlN7N|<S|%I=UmPsOiE(RvAhUJ$vEa(q&RM<oIs0(
zn%OqDEa#Ia3vD>gO_;s`#RXhQC{S*5y@-qb6~zOym)IbJRM~8{lAmKE`CVBmN)+=H
z^A(rv`4?Enb`ckW!W^x5|4)aUt#o)l5(ILb<?5a7D)_%={nr?)*xi^SiubeM-9Q`k
zp0BG@A=jzU-h4PwF($T8#}-<<2*TwN3qmaNxAds!yLU^w2v#p#L92g!&!Y?X-F5eQ
fUe5&s+HA=K<S`uIq98>KVzEUbYk9S`4{*&t1}-IT
delta 1401
zcmaKsX>e3U5XXPLyV;q%9oSq%B9K535yULWVOd4RQbeTqfR>aNT9yV0CNT#j;Zii9
zf&vQ4LjjF=i=v_uyg>271H5lh<B53SiT43(51JMD;H&p~dZxSoea;KZ)|Itv*}Z-v
zFhq_BIEhxnbpa7pW;2TGEjJ{%k()fZ*>X$3t=wi=Wx3sQhh??pPQzURNm?y;`*lr%
zd$`wfpWm#tv{}}9v-=GX1QhY0<sr+%9&x>4L(oDotpShlXo8JAW@+&Nk6UJ2p0GS=
zdCIaW!P7jG;8~utH28J1CtCtiJa2fxuP=J?k|!@4UI}=W*8&FfdZ3BCVR_TX^Oogp
zzrJJH>LK5?jDOGaexO0LTb2cUz=wXb)`$F&<zveyhEEOK0zPAVz~_9C&6j-Txg8$*
zYs)v5<(3t`Y~NbG^A5f@{LpraERmku3_A@!8h+9O2*Jo1XH`yau5PGrGW=}#r7aqr
zAo&{%zZ!ls{BHO|6H=dT4Y4ATKg0Q1C4CjZ@fW)syGaYl;k}L>J7V1U6Grx|YObp-
zS8yk=E8LtleV~X$)TfguONFfAsj5NcPGWvzhNmVpOq^N1hudT6BrB|o7sVtlCR`Bj
z9uuoDtK-E5lI<jrgvRB>Nhc?rB^hpwpID<|I?0h-4b(}V<U1*lE=~$1>Er<ED&*Bv
zOshyuZLY3Oji{)tte;rX=%h#vbka?_JLw_C9Xd@@YE$E?>nfX?E9xd2De=Odj+3RA
z<0`HW7nzbHHJwr+S~{TADcf6!l=gFSkaQ8^YS%oqNsq>kaneT)HqzJ0A)@mBn#FcA
zzW7il16XS0Fehb_GBVJ~AUWL0U>V}54^OvU-B4c{ndQ-kwau}iIdziZY(tfy+E9Zi
zNgSu-c>U7kVhsCgWVE7b9f4>@theeM{o;C9OC2%l+v;;_qN5v_Ou!1ZFoi}Etkg+t
zq8Z03y$4fO+DWg#I;JVtnRezeof$e*JCx4kTyof{mgmtJ_A2N$dKTxCMZM&4fuhA3
zDr0C-&Ty0*&1~f?Gc}1hTu8PoRKI6%rdssSDY=M?iADNpQgfLX&MoNEatW6brBcIg
zCz)mw$xJ$i`Gy6Cg@(&I-pdtOH;Y8aFE`C%g8x^CwEhFK_EUmLn$vt?TQZgX$Jc)y
z7?tTjJ_Y;P|Jx}Iy5q^TB<5QZ+gl%wF)Ys8r!`loT^!-cxH2)8gloEt>#=w5G72ge
rLY9Ulg~M|9J@peisc=E>Wm@tG*$iR1a#8Z>uSIWET;UqEk8thZ*W4X7
diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/logout.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/logout.class
index 8b95b90309a2ccc042402b7db83fb16bf70fe44f..ccfd5e751d219473a8f2b67866bab4cb123998c6 100644
GIT binary patch
delta 1008
zcmZ9KS!|U>6vuyG@4eql=MKfTVvIma6JAJ=h5(w_S`*{~#$b6U6cB+@szvDny@gUO
z*A0|KEqvfsS&FDE1;opuEt@DV6;NCN#RYHyt^4xe1JpB(X($i#|DScvIWy-%|D*jA
zZI@d114H@8Fr0eB0urg@@}TCSDC2q9!6TYS4Mi-}EYdutd0ewtvqZ7fkVd^`nd2v-
zjN?hoQ%-5nEZ3}XX@O#;;aXN{s$9s^if0UcsE?9(mgh9jYZ{}(c_B&-t2HH#*J#!{
zUZ-ht7p_;lXc)i-2QMjJR=lFvXc)*Q!yq;ru4jv;+1<2NvrV(zRe4pjLsRa=2E}WN
zq+ut!47=HrdNr@}h7((i4Be{PtJs&!@Dkp2`xOTi2R%%zwxqNwKC`l-TJfghP;y7g
zC{Mkmcw2Eeh=d#bcP#JnUeFlM%C@{uo8<$Jc=XK69#L>>;l#1Aer56US^1Wuv;}9w
zb%T%bq2(j$JR*5HWrM|Y+$kzAXL{v~`T3pF|0y3c(jzlyvYE#637=X%<3!LL$?{KH
zPVsqgJaTiE<qJ+*zT_***L>rlYpP4<R1}w&TFyxL5I;9`jI+UPKhu})&hc%q#4qge
z9p77G{NUhx(C!bt=7LN1tK-G-nre@fg4-=W@>4KOjp*HO`I$P!FP2~VP4T<s5B{|L
z#ox)5>R*3Su40^GyrM|SZ+imKkpiRTbdZixbdTtY3U!b|sLL(;I6;mt#)(WK%$>>e
zX}i3{WbPuujq+|&m@4k!9A+BDDCzzX)5WG4%>hc7L8>hBVoJqkgcoo(_YftJ)hJ^o
zmW|@Mm;2};nK5RGmPWg*NV!NoxhPq8P{385mBuTml)41H)3Xy*;t!D__Swvl)(WN3
zTaW?DFkJ&EWK;Sm;+;Z`pa&f^5xFA7J<?4X-KL$}Il0F?;V`v~k#eI%zD+np(3&3W
ad->yB9_}%px}a~y4ZXTs@0aux9{3N0S=J^1
delta 1059
zcmZ9KX>gQ95Qd-GYbM`Lf(ZqtGzt`0mQ`rVlF}a_Rv`;mqOq)?f*M@H%7V!*WH(&u
zu0c^yl;cB#H>e<rps=EV5fQ}$K@e2D?*kRQ05vFtp8QA=e@u5zPrq-!Ju}<;?Cq1^
zdUV4^pdUv)2GQg(gIkN}&uxa8QEulBXJ#2@d)&!ghB=124fh!48s=%{dz8>*Sm3-L
zWg+((?sJ=F!y?1|4)%cNL634CGBmi7hc%CQRL~S9|0s(MOAL=id7LMrEM=J?;rx?^
z<<384c-j%J&^+UD1}mLerFmBKoMyF0U)Fe>MZx1to;R#@OfMK-G^}%7)*Ch$(k^V)
zyrgOIc$tkJudu1;R9<DX3t#hO=+_NfG;b(Ewdqt!(aqmvPAr_GYE;h_&6}FHG;hl=
z3NJRbHZd_fKAp;FwrbuftOyKM#oJ^u&34VZ(#dZP&Wr4@?BqRvZm7rU0=Mj9x8;34
zP;?p4YjD+t)gv#9^-N~#>jnz7<wJJ+J3`aT_wbQ4w0ulX5gt&PJbR$!6LNk{xO?wU
z8KUSqAwD@?Sr<=@tE^5oq^HEk)FmvR@ww#-zVw^JJtALOzUCXhC4ByABFgeD--$BI
z_xxb_k-ZAjm`OCG;`M_3NkHY1{uO)pSz+7BQ;BTlh|7mtVovlg?DNx+>f-(U>N3AM
z^Si$@(y#j;jw+JL#<PtXMWE_p%by(ZPtt==K4>{aPV<-LZ~oD=S`PEC<v)%Trs>wm
zs1cegG*@b_(u_oji4GAnOjaAEXievej;dfA0fHUJ@`p#sib(Qmt|7#=g>5BkRlbJN
zggH+h;X2}SJcuofp%yLbH#1gphGFvl39hGz9J3iGIZu3!B;$$VlVt)oU|B9)b<|TV
z$QUW9E0J5NAT3cBjtJ^fsyIPe5k8Sg(w7CLz48rm9HdOr8KDYMEjlki^e6E;^lKV5
zlQmP?gQ;Q_w6TQn|4Q5)O)Kj(?DY1*6*r0xaTAwFyP*<aBtD40xHNXk@pp54x#DK|
QRDrT{yLHay1s>p*W3;^R5dZ)H
diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/register.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/register.class
index 81841715b74c9bc723f5e0f27e21b1c569d427d7..89d6cedc71b6ff4513b6dd573382bf496a3ea9fa 100644
GIT binary patch
delta 1325
zcmZ{j32c-_6vuyWx80e3JCtsrD5XkEK@owah#aOiQ3Ong!NeLZi7{(gY_aV^cR^5K
zK{?B%ZYx#+t@nkB#j7eFASw!qh~k9`o`@)lXceh5RU3#g`R2`k=H35!UsHHaIJxC$
z%LZVGoaHf|CdHi|KJLn(jJq}W1gYU(C+^eS?-Anx&4ZeUG!JXmY93KM>d~1d&0}s~
z7o?iUHO=m@Uh{<JN$2*I;%SfWJmcBGEsAG7@@Vo%KF9Mx>e--~?_6KdEYK{}EYd92
z)M=JzUevs#c{xY}8-uK5lgB__QEYbmt4_S;#OsPJ9&hlb$6&U)MB6lPY2J2@+cS8F
z9h!GNcDg3!x<K#gB=5UQcRBHa=0nX#uCk9ct2{now>zwN4ScHkO!K*Bk7lpt3&od;
zuROly8;@_<m%(@Jcj$Y~0nKX78b{<0njc;4gNmONKMR?O*j3S*G0~c6Z6pz^ZJs6b
zB=?Zw7sX-08#TQ=Iyq4ptBEUqRs7am;NKx$tKxUXABrO>mA=!*pQ+vHJqrv+X)}U|
z(7Cwaym2E-%Pt(1Uy-P;Dly`tE!8_PyT4!3jHJ^jq!))PimWE!4yrhOMQp;1l6Lfu
zi%M+|<OZ~47^bBT1`4t~BSA4nI!UIH&XSetqe{jb2}!n*F4EOVj&u{UCq<@3!c!BK
zRpF75s%XuGNUf0*<U}LgCD%v~$@|wPKBX#LT3H>9CnD98m7L_1CmSx4o`zewEwxci
z%FUMoCA|z2rBFyqMB_zDdK>8@1*tJQzpr0TG2)j~g@BEcm>L&+<Hj24E2k;xXXJG0
zZ)AY&eT80n_CO<H8kGz(QY3?woMB{$oM~jJ3=={ZRm5r&`4gh?^4iLF&W#Lr)W}Si
zVMOz#8C%u(GDWqbMiEnXe8r03Xe-XQtBnv!alA!`mA}nCzrRCm|FOw-1?=S%YDpuW
zN`^{%9DA2&*9%kap2oE11EEX&$*Y-87VD&x8C+u%?vz1X%S^J_E4`S-Y`U;ddXQue
zU8UXzpKI-MDD=T~TyGODmj>optzv*2X1+z5VX~hE7G-db>|vor9%E$}i!2Iqv20_p
zMTX0V%O>h9>_nxsu*9NFOHmz5S!Sm?%U8riuC&$W`1-S)6{Pz{+ahn^#?+CVKFOO%
z;it;>Q;u$9Gua({DDv7ltyeTCZvLNdrDC9fYLyXf<P!L=JNR13Jy&r-_HhI|GCKwM
xn@!;s8dGb#4GkU3v9!<Jp>B1Bt88CBOU4jZTjaNt_G67jY1aRC8_35Ue*pvs77hRa
delta 1386
zcmZ`(X>e0j6#l*>&AoZKUDDDjDN3QTh=owB6tq;K6rJG*&REBR8PU)NT1=BRNuekZ
z6ci{0mw<{(wMFZ`U|lQX0&ZwQtW^|Oa7Ek|sSEYqICfwhX5KybyZ794&Ue21-dpBt
z^~HA_>D&sSh~*Y$p<Un}3pU*A!c5#Jalac6;6Y;^l6cs{BY0F|v&3T(9TJaAJR$I;
zg><w_JZ0vm-FOC_63?2&7K!I1wwkc#1zxZ)5HDIf@k;{REDS=sh4^;7?8Ym2Rbr(H
zeNAGO#A=Bqi8T_<5^E)1m)Ifkh8u69%Z;7bWnm2764-6#w~gsG<{g0^3-97R3*)fI
z6nbCc1BtyR@Ix0q!p9PySoqX5vD_s3OvbU#Fx_v==MrB?d})|{CDCf(YkXrCTTBB7
zB)*k6DDj=d_Yyw{{3!5~g`e?@g<tWT3y1K#L5C%JCE6r586p3W_|xS6OW<#TBScy(
zd|4oLZXgth_+#Nn#}ck!o_6&KLXcV}!YXg94AjMH!l9_3P0-$vYwu>(HbIAAil9?a
z=<YRz#9>E|jWV$-W$*}{K+#1@(M?69mkgOYqpV`)`Q>@lvD#p%POg|rE0OM8T9L+d
zT~aXvEksI*uez{Q(PI{(#5X5gwWu_Sl7Whum`!BO_b>4Kg8tAvUqy8!ywE=<7*NdO
z0EI>b2ybGy!<#Lbt(e0TG*!hDIZ)Bd+=L}cFV)Ny2k|7$UGZcNR?OoNA~Tt`AyyOg
zmHC5#P?bNTIF$K{r*N3!aE|!zOte1etEj0BL}UKiI>C{~d8)$29Hnpv?o70a`QFo5
zAUIlKF2@j#SRh&`=u;fag2Zr{H!_WdifJ52ICYj-LzJ-1n67v_iv-V59M59K30k9&
zY@Rex@l3P`o~2mANrGCTvw4o<WKJPG7gUEMvAn84v@%kYyeh>qqaPQW3R63ZU0q^U
ztw2a1EKny<4}H1y?rGYbr$-+=(3g1ZiT+deKK<_4``!8jjp*Ujn^DBzKtp1-ry}?0
zy#+}>u~5$rG<I}(F0#iL;c{ePGb?Zf7VCmN9E&AbicIY1P{gqeSvbI4T#2hNfa^8K
z<@#JU@@>EhT&)YP;|5%#y#k|o2rD&`DCR+|(#VC$+=tZ~S(wf}Xwt}y3%L_(G*Y-^
z0=J`C!&KC;6Kgd}!$vk?9j?`%M24*pb1_e|&9)WbI$Vzw+cZt`1|$-DvxmjkV*~66
z>V7IA`}98|vtJK^8<U#eByh99#^XG<2;53Q^m1Y!ym0<M9I*AmJ4N8O%wq&LVx~Ir
wubRZ|Xh}5ZjQ1R^F_Z6HcTQ7&tM1FD#VA6XMs_XfC~VTmq2uq;iEOz0ANblNBLDyZ
diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/tesKoneksi.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/tesKoneksi.class
index b76da22615b7a5da6be2a7101b4ef392fa87479d..770d8afa50006255f648df8999e1dcf8da558022 100644
GIT binary patch
delta 450
zcmZ{g%PvDv6o$XuL-)?<Nu&b?6^YI&DRr&eQJ1#v)TK)6PMfp|t<V9ZhF3T<1CJmP
zMiL&t$jg{w9}!_-u>QT*`oBMWXFd6E{k50($7i6If=M$&ieVq^*shEyVkRAoD#jG!
ziU~zrk&q-!ESH^h&nX{arWG@8Gpm?W%)7A#$)ZUUDU$$8ie<@)WL4m`OXX5ECNM&6
zceRWNq$O*TjKEBu9~MrkrAqlsvM$+h-o!)DB1_I<lPy7m9ZaO+>FiRnwOBnqidk%v
zb6!1H;T?7@_UISX+mT|IcJ|#y+L41w{zAW|Z{Lvv=h6rmhve^XjB6tokc1`ek`AfA
zE426~wM^^!z>k#tC4MO50}sZJt=AaQ<<-MZx~QYu5h~<7%5d}VdCwOk^vcmppJvi6
V|M`L_{m!Y1HvUct26WcL;3s*~Ky3g3
delta 486
zcmZ{g$u2}e6o$X*i>lndiFAYok+4F7YaXvQwt3d(@pfyvrF9D(!%D&fSlpe5kO(UY
zD=RPK4N%uYSXk75>ip;bs*-aTdJbK_eLTGYEgYDX;V627gz5FAPtk8Oz@TDC5m5{)
zMiirxF%!$rj{9{Y$RtyWX}_6K%qr%5Y+kZpQbN?EltsmoWLdHzC~#7lR4yzqs%!2q
zmqdlOS0!tbb&Uwj$ay?*luKnZCz1`xruQx$t8~C(i*1V?TtT5zIW#jEU7d|oBy)%9
zu!b#SY<sVPtI0UK`bmofoq~MFPBw-u_WVXVb}YMlp+DERZ_r|&azW97d+OS0H?wa?
zlgHUJH<nIVBuPEo7`Mh+t)xy;FR>*J2ra>3EqWIXpM;Q-zlooe@ks#VXRKG<s84}5
vn`kDF7Vla{%YJ*U-*Z8mu6eZUd9_!nYRmu22s-HW;;OCqH!0}Se1PsR#f(c-
diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/validate.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/validate.class
index 491a2d9d5b60658adf66c9bcad4c0a8a171a69b0..87e9b798eab2e001df559730747abf378617e749 100644
GIT binary patch
delta 802
zcmaKqSxA&o6vuye(z(}f?#oCeOucADPa$MfU=NWHln)a06oE}R4-+ani`rsitF~G8
zweS0GWwvVBZe?YwR<`ep*}m9|_I-j-5W(U6&;8&3`QLNll=W%p9jR-pssRSjYLHBk
zWSW74A{POsEBr2UnW31em}T>`4T>po5oV5Lu7RdVG0(>NiUl^7y2xXpi+mO-#@bkB
z5YJ*enTjPgvsALopn&BD5f3XAD{Xd_V!VNe)si)~daa$-Dc0Mz8x$LD=S_;uiY*3P
z*{1N?GnE<y*{;~3*s0iM54T&gM^bLEmwg8NsfghKm3DPdamXNv!-^x4qoSg1sE9fy
zsj3|2s21I;CC4QvBsG$gl2ek?k~3yPRCzzmS<Y$BQ!8)=L*7t0C~%~uYA$e5a!FIi
zWz7|?3gXOBF>z+k=;TN}*90O#bDcuX4Q^^~aa+?sqvj5GHTP%|xO@dU{(vt%<j?YH
z?(;wpJHeahO$_E{CXTj9>%puXTl`Qnghv7u4*CMwUR(Z{TFn!lcJ_or{>;P_Z>BFh
zLwf_7XFS)u;HB9d-K$GIuS~bIYv0#23Ur<~)1Q&v`J3pDqvVa|E$=kVyf@RFgG7s2
z>>S+VgXSZJl24k?e35+BeB-<32R|#DoMVhgk|b9WkT@hkNk|fw<aHGJLJ}`2ka#-6
zy0ao)2ynMj(oPD7<bMX>@U#<y{HF}dKcW9GVjXTqSnKSx_F^QdOzfxylPrv4vf1Ds
X=l+uuOrg*m9y_qx-|SRN?;!FUs<6Gl
delta 831
zcmaKqM@-Z~6vltEEIZ?W=dvglJc)AA0|$(n=)uTIIe5{FG0|1`um%Y3E{IrGQSAM%
z*n96HiXD5yjvagNy<!1pNJum>CX@HxeDl3;zBifIt!AXftLpYt0&RuYp(7=du?`+e
z{ETC~BJ5`Z6BUyblPx~QVJg%7OlO8<rh}$L;o3Y)G27-+KXaJtXCCtvy=`9L(1L|F
zEK)4C$P&p?hh;2xh^MeZvC^We6#X1hSS?v&*=ucBr&w=gHz+n*<xPssiY*RXDN_Wk
zr&5P)lq<F?b|@;Wxt)?-lHCq_*z2&5{Y|LkfUOQH4mo6SSaC#hRFu_q7T#l$<K<mE
zdqvuA$qC6x^9qtvk}An*$r;I6<4JPP_%_OJQ}3n>!_u7Rf@#oPq*~yM#)7f@sKC=b
zOLK|Kk}I04Tr(n?>)dc(czeccxG4~+np+ebY0Yi!7=6uM?rHAxK=Y7Cn#Vj5_(O$x
z;Yg@YESwY4Jmr}nX<)D*m>wOJo!-NM=E|HrW6biOYdY~lpz@=kNN&(}yrf$5ir0;8
z`LX11c6w$oJCr*h7}31pt>zu?-KxZv2{n9h-z7F{{gDR(T@cI;59rf4Qewka@=5cV
zFXnADU-{;?@wFGVZhv2g=HE3x>_9&?zo?VcYcr+L!XpyOD}242_#jC{5|zXx`H}+3
zU`b&^F+@m;Bts>`8kRXTt4Ih4d}Dk)nK+XF34kZ1o+ikD(lGj|!)r<M1n6r1y3c%?
lZe%f{p%%nV_A=5f3-k^Ai3vtg?4~BQOa2=jZTKF>{07Nm%_sl>
diff --git a/IdentService/dist/IdentService.war b/IdentService/dist/IdentService.war
index 6c77fc900fa8231d6cebbe1cb121b47fa9163203..25c4485aefa7fbce7fb4ada7340ceb87ae91dfe2 100644
GIT binary patch
delta 9951
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
delta 10307
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
Z%W`*g{~g|zwl8?cVedef>wuS~{}1ke-6Q}2
diff --git a/IdentService/nbproject/ant-deploy.xml b/IdentService/nbproject/ant-deploy.xml
index 2d5f877..5d33e0d 100644
--- a/IdentService/nbproject/ant-deploy.xml
+++ b/IdentService/nbproject/ant-deploy.xml
@@ -1,4 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License. When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+
+Contributor(s):
+-->
<project default="-deploy-ant" basedir=".">
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
@@ -8,7 +47,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
diff --git a/IdentService/nbproject/private/private.properties b/IdentService/nbproject/private/private.properties
index 10d9cc5..28552d4 100644
--- a/IdentService/nbproject/private/private.properties
+++ b/IdentService/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv3-445781616.properties
+deploy.ant.properties.file=C:\\Users\\Frys\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31137312071.properties
j2ee.platform.is.jsr109=true
-j2ee.server.domain=C:/Users/Ali-pc/AppData/Roaming/NetBeans/8.0.2/config/GF_4.1/domain1
-j2ee.server.home=C:/Program Files/glassfish-4.1/glassfish
-j2ee.server.instance=[C:\\Program Files\\glassfish-4.1\\glassfish;C:\\Program Files\\glassfish-4.1\\glassfish\\domains\\domain1]deployer:gfv3ee6:localhost:4848
-j2ee.server.middleware=C:/Program Files/glassfish-4.1
+j2ee.server.domain=C:/Users/Frys/GlassFish_Server/glassfish/domains/domain-client
+j2ee.server.home=C:/Users/Frys/GlassFish_Server/glassfish
+j2ee.server.instance=[C:\\Users\\Frys\\GlassFish_Server\\glassfish;C:\\Users\\Frys\\GlassFish_Server\\glassfish\\domains\\domain-client]deployer:gfv3ee6wc:localhost:4848
+j2ee.server.middleware=C:/Users/Frys/GlassFish_Server
user.properties.file=/home/khrs/.netbeans/8.2/build.properties
diff --git a/IdentService/nbproject/project.properties b/IdentService/nbproject/project.properties
index ee4fa46..a043060 100644
--- a/IdentService/nbproject/project.properties
+++ b/IdentService/nbproject/project.properties
@@ -41,8 +41,8 @@ j2ee.platform=1.7-web
=======
>>>>>>> bcf1435806005cb1ed3347eeb593de560332f805
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
diff --git a/KAA-JSP/build/web/WEB-INF/classes/NewServlet.class b/KAA-JSP/build/web/WEB-INF/classes/NewServlet.class
index 330d031495f4e3425cb0c01fbf0ba64df7d89f75..8d8af3f34616c446e678a0054ccd5d4146491086 100644
GIT binary patch
delta 471
zcmZ{g%PvDv6o$XugS~TlLNwArMKG(RR9)(J)U9>Dt4rOrrENk<bik-$W@K<)gqRt4
z03#1!>J_k$h%hi%|JrN)|DV0qy7gW8%FpkQPe2z1lX_x`Aup{AyD*{{HECl^5mzJ>
z<BAEzq-4s(a<$WLp79c5Rx#%m^NIz<qH9}{ESvaQF$s`VtV-4->w+q~P%M;U0wdUR
zUrva?h9o7~6qt#N%;8z7a9TW<Y)Q5sUPYZ~w%B3UVvl`6jolny7)z!W6HWQj$#Kl$
zfL*82xDKVsSY+uDRNCQuL^FqOA?<MbG<&JP)30yKk@I2%j2!ugH{-_G3`jzfR!N)G
z^9l{#aSeJ={|B{5$zR2f%J{&8@k8r7hILfwW;+oo=x|<Svi^6k^NSby-e|sC^Fb%4
jLJj|E1W|gNI~8sD?ex&A{T}-0*SQ+OfDU^Lan9f;b<RU^
delta 486
zcmZ{gNiRcD7>1wIi*s^&LkzJX5>`l1rRJ-~nrB68riRu~5?!z&c2*Ym7x)QcXCblm
zBm5M6*FsoWeD8a{cQ_|GHzoHa*KZ%sFF=H>O(p$?fgpnn`7msV*^Dr17&D9;CJd8?
zDb2Kv<7a1lo((d`ykWs#77cO3l3!catk{&3u&E$vSk<g)))fVACY#Ac6;@sS<8@3`
zi@c%P)NDybVaG00`{%jLS@uG+t=V~cS7oYJ5)Qkh9QN2(6uC9SvqSOZT&y~sJ3Wa?
z+u?weS8Cmc4oS<M4jH->`EDp3jyfFqi*`f1XM0!jx}3g?4#(cBRbicQ`t)wyS*s12
zMop6@q-jP81V;qMWIicIYyKvFQr0H{tRGvxH7rvgVhgS05%FGiyz;l!_U$X$h4bhT
nzs^gThN}NEicY$`2h(2vyBVNc`T=@yg$q&i%0$;t7xaAr;z~z(
diff --git a/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/MarketPlaceService_Service.class b/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/MarketPlaceService_Service.class
index 63ea6d742b8cd6f38440397c3d3fa52ec82cef67..6391415a9a3126e57cac65ed19b2fd2bb5f1ae8f 100644
GIT binary patch
delta 232
zcmWm8Jx&5a7{>Ac0OQO~Oh`09qlu**(P(2tT$WLgMQ|4vKZ>n9!L}rO1(UJ$5QdI|
z19$-&&tlwZeoyk|$&>f9^U*24|2A9Tj8{X8D5w}3+E~wx;#L!CP7RWgV(hPXo{4Y9
zo~fp<xYrB}O=gO@;=!;_qDU1B!O=8KCU!B8!^oyK$;Oe*m+3Ih<JnjFQ(xze10f#W
zN?z!U<t`adZYvMPv-_2!#*3imN_p<yg<iky1hU&y)w)pZ1=P5#zOT`vTV)Hu6?IMu
M`dk-;92X4!0W&oxxc~qF
delta 267
zcmWm9y-tH*6oBFPYoQ+y5(iUJQ>&XM#t@C&{G))1rM5y#t$$4i7Y7%NYcB#<FT!+l
z@B+L6Z^YTiw>&2~Iqz`ZoOfsT{rC9=?DJqz=hQ4YvsmI>5lJo#0)ssZosJ|{+pgkL
zUG@}xgSO<#AhcK@k))D=#UevVCK(Afx?a)=2mRRd!!%5?$PXu@G>9j0?_>5;HOsn8
z%5a`(4WV5NTE%*;wQV!zMsaJi!m5qKvcP_tzE0ie#}{{)#5QZ(37W-@)+~PYO>sYO
k)FRzIkQ^c;M<x}H%Lgl*;FhzFz@y4;P8&ZbU@Is52Rwx<XaE2J
diff --git a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/DB.class b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/DB.class
index ba37c6e8645c1a52c3a0270ffa9adddd806ae5e1..41d17d8318cb2f3e7eccc17b4666edbf7770d296 100644
GIT binary patch
delta 156
zcmWO0I}QOs9Khk<OtJId$wVlGR^|O(>-}cwXvCqEdjg3Ih;9o}JCIWNPVl{KVx#vr
zc>)1@OPaEwB2+Ck>Ow<k3N1^Uj*q5m2z+{kLf<lAXc!4&!{i>FRD4wjZ|ayak3T9*
rEgS`wjvRSKHa@DX7*>uooA|67-qsPZdtCHQXRNFYDM3;EXEdcBu&oyw
delta 160
zcmWO0I}*V_0D$3tx5#dGQg8xMc}2V;-mf4YjZwISTR6j(E}%6!g;6_=6Bud#ulb+m
zZPL&0`2r&Lh8#6Tps5=|8k(l2rD+>FL@tu9B6jJ~*9;6pMvAd!qL|*(lW;Q4g1w4^
yGxM0UuwM~7iARy84P?Ptd8|q8QHJiuW6Mt9+q3W=H+hlyl1>z5ji8bZNveM@q8Q2m
diff --git a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/RestAPI_consumer.class b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/RestAPI_consumer.class
index 3434d5267af03308bd4d58eb37277222426b0842..0fc54e936998594888fada1b6717022a5edfddc5 100644
GIT binary patch
delta 466
zcmajc$xhTk5XbRv&-_UZZ6`C3I1)lKauA4NnIMLQ7eEmlgaJWh85WU6M8#nTMZpDJ
zpby@B2P7epgAYLB!N=gh8yN6k@d3DeI$hPjI#mBj{!FePpB?=I8t|4XGKEyquG~{P
zgicEV86_K|D@M1anfrS05qd3-2TGstQ0Ny1EO7=cMGRRI<dk7y#FEr8Nk)Y+;gO}3
zaZ6*I$1x@}G$~B!Ic-VtM43^ZDzn;nraTv32y^>~r^dYWhmo{DiEO0v%p1&AL-bmG
z+Ofc*V~J&ho6O~Nbu(jgbzL2;j#^e6tE~C&(QNTLue9=7*>JpJ*#|*I^evmdCb)TJ
zi$=#g-W!7UOlQ{dffYlE{~akQcYI`9b32YtI`gwW{-S(k*Rgl-BiIbCR|?I76XHTb
z!kzJ#%VF)DGK_=^4k-;V+&ah=-Z0VIwD@nftvby852Y^1-J#VdE;UJ8_=OSf{sZ0O
BOt}C6
delta 493
zcmaix$xf6(6h=?=|C8HYsRU5zMF)c$#25oaz)pApKtYg61sPgJ6r@2JoNZ-t2DF^O
zrM>_mA%TStz>dTR@Bwts!ifJ3VeRHr-MaUDRY`3mx0AW8znkBIYQ9*G(V3u(^NI_K
zi$a$rk4{B*oJ(<fEWPw;-7jP;j?0QG!c}2FxMs;`&{D{CO93|&L&C5nsWC}z3L`?+
zl48`7&SxynEtPHy<GM~*N|;nkDefrlYU7^bzVJYJxVrw^9E>)PqDSms-4(_9Z?VcC
z3i3Z<)2AMjGngZWp!8&AH0yZ6Q^zzj1~-(M%2Z?rCMr5w8y)4$I_8)+r2J2l@?V4W
zfoD9|#tX$u$17(1ui$9#nm4{EtU0tm+Of!zA#7=GYj?b5*7t^oOWxsCdGGk3sULOj
zlj1YWj+M2Qa4tMvC)5iK!fD}*&<KAhiq3W^#t3zarVzu~wT48M37To~Ioot1^7f>2
S|M6OB^E<Xy+N0l%(eV$_hgeAf
diff --git a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/UploadProduct.class b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/UploadProduct.class
index a5856c7893cda609d34e7485d240e7fd97b10506..5c1b5dbe661eee7d43f7d4ea91d1d25abf4f4c2a 100644
GIT binary patch
delta 1248
zcma)*X;76_7{`Cly%)~8?>!=mEMbrsR^~8-gEiwY#)L9uO*SJ<qggYM7r4k`16WQr
z%+!an&G415QnSR$7F%v*QQ2yXEwtKZrR`-I*+OJM=MXX1Z_Rto|Jk4SIsZ9l<IMh&
zj@`q(JAqP};ZenA&Fv9txx>L0O^-(%TQzrT?$X??*`~Qiaj%DQx%WAFe}pL8H4ixB
zLCr&&hh14*@rXwjk9sWRG0hH__qe8AvqE!;<_V9&4thPF<SEV5F1#~BC(kIJ^>~iw
zBfP+i4s6$5VP4{8k5}00a$eQ!R=nm>#Ac7RyzaC&9K7iu?tFHDK95q~(!A~DI}YB}
zyr+2IV>Wv%Ea3yEe&`^s`AG4xM>(Hp_9{O0sBrBo_)PP8gmvum=wiR-3p+YrYQAzj
zeXaRM^R4DP&G(ugGzSzvDt?MDmIlc_sQ6jYFL?7Vy(qf8E!NW9s`$m<A85=B)y5j5
zLdsbU)hnutV=cv%){f5)7Kndks6Tb3;*jE3#TAO*6u-y2lEPA8_=5q%p9~5U%L?W$
zsHj?W&b%r0ZB31H41Y1;?@GR^h{ODC7@}K9Dl4upv7upSsIuakmZdA_jA~;wBmOFt
zdom)1C0t+&+FF)Hn~ek{D998eAxTn_Y&(b&g0ZGLBU-{nJi7fpm6;MTVq}7n6eANQ
z)jy=>W~Ui0lyoH-MkYz7t!j(53VHsip}bR!WJ$J>968EJu1pq8;`t5dGGNEE1vTx}
zZAOlkJR|v%=lAI8;bUB#9jU<Iqo>MLe^8&Df2<VRIZrY&O^!2iygO!K!I?%*km*9H
ze=wZyuMXz~Ph=q86YkWD7b>EPT1B0*7gQ`nDlMFD_Xuey#gQ4~S-}wk1jobn;ndrm
zY@IQCYeF>mYtpMGC;FC+#)U>JLo~&Q)At5vG}A%`2Ux^%E+$PXnZT$|YDgN>F8f#W
z4`=P@*e92BHLFRN4fb7J!?k3{7J9jk>zO2d++e>oWU|!$WIL%NY$I)aNJU}7x^YzR
z{Liyi;VX(P3giw^rYKd+o^_g{e1tF=u1&`nTmQ3<t#_Q3=eQ<kSnh_1V1+Z22MG+b
zN>QO$r|6nB?Fa@F*%EG|+cJ9|es506%*0TD_4cFzZsry%v#oZk-R-SxVB`5nE1S3t
F{sD76051Rl
delta 1297
zcmb7@Yfx2H6vuz-UbuVTbGOJtkuV7eHA}lfU_}hmgfcZX*^Kl-r5Z?ti##kYnqv$z
zeaYV0u@`ApR%#EaZe>wX^v+DvUY1t&e%Qn8X$7=57K0y~Is3mJd#!c;>p$o0FI-d9
zxn-cI7buoek1953Hb%IQ`yD)>dC+4M-I|9q4{ILLBs7mI9`i7+_Hk!7M|grKH9anP
zO7pbl8Q0dUc-AA6=RD@nr+MDhy`X8=EYU30yy#KT$x9wD^NQwGcl}y~ExfMS>hT8K
zB5dbP2X^X?Fgtn6<88WK%{!WR74LaWV}r*o-gn*y4t6`}bva95k4G^dYCdxIV+VUR
zpC~@{DCIK?)qL*UFC6r0zEphWaVlSHzEOPZQQ^i{uut<{gzx#m<45*uezMd#p!wP9
z^o!<K&2O6DHGgOhYW`IGrT9BBPa0){_4*Y9ia{%g;LW<^!n(!rSZhn068znPro;uo
z9LY>t7;CB%QqF3uSyB^?wMHv#e2Tw3=|KKg#WE$LB%rv=Zf*CnD_E+QqLQGJq(nz@
zSSH)I7)h3pv87rVU6wa<c16|Pb7ti>#G9MSEdwKA3Hj?omroZ@B9@pD!&)J^EZR_5
zZe)}TR9UpPb-}XoA#bSDNQysSWmk`uR6{lA*@k%QqPi9%X_78Tu8|BGqhzd|Aelli
z)?9C7oMc(nMvibpQ-{`Ss%fc@&WT?fYpGX~ZDhP0sbqqY968G0re>z(8qSwICHY2<
zmI6OlPb#%r8<{ARj7*kej7*VZ1v643!?_Z&T;p|Zwe2-=Bge^9BhzH6-=U|3k9U1h
zBh&qEoiBy{PJMPkk(^*jPq)$;DV7qepOG1kWMKB0MoyHIgkrxhoa0xAvw|l}D6urW
zQqQYXEL7Ah8Wb_aLZs5d>GlkghEg0}F<ccKBtUTZ+Wu{g_JnM5k^R(?X!2{*tHzJa
zH4ohjE!HN{n%I%PCz!XGi^z~lMsdiiCHY@(`618WmAScdA9Gp36_(Im>EKGPB3)L~
z$JJb8yVudfwOq#-*>3IitYj<;>`OM0I><)ShDj=J81eW+{;K~nH!5yY+-y-GyPq<}
zEs9%9PE&Mt4H72f|Ie}gPSdU|JEZFjt6e`4tZ`xJAb|lcRotdntyohs@h}BPs+BC<
n&RTy(){LT&=>T`wEd$)iUDl4X-a32Q+qj#1<|A#~%X;_+-x?C{
diff --git a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/tokenParser.class b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/tokenParser.class
index a0130494cc1ec901acfdcb72b58e81e9d8519dbc..616683539244637a7013eecf109e7a46c248a286 100644
GIT binary patch
delta 111
zcmZ3*xt!DT)W2Q(7#J8#7|ggBxEYi<7?imf<QP;ygep6O8W#gAgA#~P2N4<|LX(|A
zi=9DxqUAS6oyi7_MqE4$x(s?e4EhWPlk*v61PmFBco+;BjCp{DnlduTPi&Omyo>Pz
F69C1q5sv@>
delta 114
zcmZ3^xr)>B)W2Q(7#J8#7|gjCxEYi<7?imfR2Wo2gc>`8Iu`>ggA$0)01=uXLW`Y2
zo1H;tqUAS6-N^=wM!f6{x;zYe4Ej6_1`LLia~Nd=j2Mi07>pQ9co<9>%orKuCpOA&
J-p=@e2>|tR5#Rs-
diff --git a/KAA-JSP/build/web/catalog.jsp b/KAA-JSP/build/web/catalog.jsp
index b8adfec..bb83ad5 100644
--- a/KAA-JSP/build/web/catalog.jsp
+++ b/KAA-JSP/build/web/catalog.jsp
@@ -42,7 +42,24 @@
<!--Application -->
<script src="scripts/app.js"></script>
-
+ <script type="text/javascript">
+ // Fungsi AJAX untuk memproses likes (tambah, kurang, atau tampilkan)
+ function getState(username, product_id) {
+ var xmlhttp = new XMLHttpRequest();
+ xmlhttp.onreadystatechange = function () {
+ if (this.readyState == 4 && this.status == 200) {
+ var obj = JSON.parse(this.responseText);
+ if (obj.status === 'ON') {
+ document.getElementById("status" + username + product_id).innerHTML = "<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/on.png\">";
+ } else {
+ document.getElementById("status" + username + product_id).innerHTML = "<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/off.png\">";
+ }
+ }
+ };
+ xmlhttp.open("GET", "http://localhost:8080/ChatService/RetrieveStatus?username=" + username, true);
+ xmlhttp.send();
+ };
+ </script>
</head>
<body ng-app="chatApp" ng-controller="chatController">
@@ -246,18 +263,10 @@
out.print("<p>No product to be sold.</p>");
} else {
for (int i = 0; i < result.size(); i++) {
- urlParamChat = "username=" + result.get(i).getUsername();
- RestAPI_consumer consumer2 = new RestAPI_consumer(urlRequest2, urlParamChat);
- consumer2.execute();
- responseJSON = consumer2.getOutput();
- if (responseJSON.get("status").equals("ON")) {
- out.print("<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/on.png\">");
- out.print("<a href=\"\"><div ng-click=\"setReceiver('" + result.get(i).getUsername() + "')\"><p><b>" + result.get(i).getUsername() + "</a></b><br/>");
- } else {
- out.print("<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/off.png\">");
- out.print("<a href=\"\"><div ng-click=\"setReceiver('" + result.get(i).getUsername() + "')\"><p><b>" + result.get(i).getUsername() + "</a></b><br/>");
- }
- out.print("added this on " + result.get(i).getDate().getDate() + "</p></div>");
+ out.print("<script>setInterval(function(){ getState('" + result.get(i).getUsername() + "','" + result.get(i).getProductId() + "'); }, 1000);</script>");
+ out.print("<div id=\"status" + result.get(i).getUsername() + result.get(i).getProductId() +"\"></div>");
+ out.print("<a href=\"\"><div ng-click=\"setReceiver('" + result.get(i).getUsername() + "')\"><p><b>" + result.get(i).getUsername() + "</a></b><br/></div>");
+ out.print("added this on " + result.get(i).getDate().getDate() + "</p>");
out.print("<hr/>");
out.print("<table>");
out.print("<tr class = \"container\">");
@@ -341,7 +350,7 @@
}
}
%>
-
+
{{user}}
<br>
<div class="popup-box chat-popup" id="1" ng-show="isReceiverSet()" style="right: 0px; display: block;">
@@ -351,7 +360,7 @@
<div style="clear: both"></div>
</div>
<div class="popup-messages">
-
+
<li ng-repeat="message in messages" style="list-style-type:none">
<div ng-if="(message.name === receiver) && (message.to === user)" class="talk-bubble tri-right left-top">
<div class="talktext">
diff --git a/KAA-JSP/dist/KAA-JSP.war b/KAA-JSP/dist/KAA-JSP.war
index 5b796704304f25654bc513b4eecbbde91f91772b..f6c37564ec486e1979698a7128ab7df399bdde62 100644
GIT binary patch
delta 23796
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
YC$ytXH!dC#tc8D{fZA6*FGK480A5O@IRF3v
delta 19589
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
OF9WoF>?pkSP5uY+sdaMz
diff --git a/KAA-JSP/nbproject/ant-deploy.xml b/KAA-JSP/nbproject/ant-deploy.xml
index 2d5f877..5d33e0d 100644
--- a/KAA-JSP/nbproject/ant-deploy.xml
+++ b/KAA-JSP/nbproject/ant-deploy.xml
@@ -1,4 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License. When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+
+Contributor(s):
+-->
<project default="-deploy-ant" basedir=".">
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
@@ -8,7 +47,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
diff --git a/KAA-JSP/nbproject/private/private.properties b/KAA-JSP/nbproject/private/private.properties
index 10d9cc5..28552d4 100644
--- a/KAA-JSP/nbproject/private/private.properties
+++ b/KAA-JSP/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv3-445781616.properties
+deploy.ant.properties.file=C:\\Users\\Frys\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31137312071.properties
j2ee.platform.is.jsr109=true
-j2ee.server.domain=C:/Users/Ali-pc/AppData/Roaming/NetBeans/8.0.2/config/GF_4.1/domain1
-j2ee.server.home=C:/Program Files/glassfish-4.1/glassfish
-j2ee.server.instance=[C:\\Program Files\\glassfish-4.1\\glassfish;C:\\Program Files\\glassfish-4.1\\glassfish\\domains\\domain1]deployer:gfv3ee6:localhost:4848
-j2ee.server.middleware=C:/Program Files/glassfish-4.1
+j2ee.server.domain=C:/Users/Frys/GlassFish_Server/glassfish/domains/domain-client
+j2ee.server.home=C:/Users/Frys/GlassFish_Server/glassfish
+j2ee.server.instance=[C:\\Users\\Frys\\GlassFish_Server\\glassfish;C:\\Users\\Frys\\GlassFish_Server\\glassfish\\domains\\domain-client]deployer:gfv3ee6wc:localhost:4848
+j2ee.server.middleware=C:/Users/Frys/GlassFish_Server
user.properties.file=/home/khrs/.netbeans/8.2/build.properties
diff --git a/KAA-JSP/nbproject/project.properties b/KAA-JSP/nbproject/project.properties
index c43f872..3867ee9 100644
--- a/KAA-JSP/nbproject/project.properties
+++ b/KAA-JSP/nbproject/project.properties
@@ -41,8 +41,8 @@ j2ee.platform=1.7-web
=======
>>>>>>> bcf1435806005cb1ed3347eeb593de560332f805
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
diff --git a/KAA-JSP/web/catalog.jsp b/KAA-JSP/web/catalog.jsp
index b8adfec..bb83ad5 100644
--- a/KAA-JSP/web/catalog.jsp
+++ b/KAA-JSP/web/catalog.jsp
@@ -42,7 +42,24 @@
<!--Application -->
<script src="scripts/app.js"></script>
-
+ <script type="text/javascript">
+ // Fungsi AJAX untuk memproses likes (tambah, kurang, atau tampilkan)
+ function getState(username, product_id) {
+ var xmlhttp = new XMLHttpRequest();
+ xmlhttp.onreadystatechange = function () {
+ if (this.readyState == 4 && this.status == 200) {
+ var obj = JSON.parse(this.responseText);
+ if (obj.status === 'ON') {
+ document.getElementById("status" + username + product_id).innerHTML = "<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/on.png\">";
+ } else {
+ document.getElementById("status" + username + product_id).innerHTML = "<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/off.png\">";
+ }
+ }
+ };
+ xmlhttp.open("GET", "http://localhost:8080/ChatService/RetrieveStatus?username=" + username, true);
+ xmlhttp.send();
+ };
+ </script>
</head>
<body ng-app="chatApp" ng-controller="chatController">
@@ -246,18 +263,10 @@
out.print("<p>No product to be sold.</p>");
} else {
for (int i = 0; i < result.size(); i++) {
- urlParamChat = "username=" + result.get(i).getUsername();
- RestAPI_consumer consumer2 = new RestAPI_consumer(urlRequest2, urlParamChat);
- consumer2.execute();
- responseJSON = consumer2.getOutput();
- if (responseJSON.get("status").equals("ON")) {
- out.print("<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/on.png\">");
- out.print("<a href=\"\"><div ng-click=\"setReceiver('" + result.get(i).getUsername() + "')\"><p><b>" + result.get(i).getUsername() + "</a></b><br/>");
- } else {
- out.print("<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/off.png\">");
- out.print("<a href=\"\"><div ng-click=\"setReceiver('" + result.get(i).getUsername() + "')\"><p><b>" + result.get(i).getUsername() + "</a></b><br/>");
- }
- out.print("added this on " + result.get(i).getDate().getDate() + "</p></div>");
+ out.print("<script>setInterval(function(){ getState('" + result.get(i).getUsername() + "','" + result.get(i).getProductId() + "'); }, 1000);</script>");
+ out.print("<div id=\"status" + result.get(i).getUsername() + result.get(i).getProductId() +"\"></div>");
+ out.print("<a href=\"\"><div ng-click=\"setReceiver('" + result.get(i).getUsername() + "')\"><p><b>" + result.get(i).getUsername() + "</a></b><br/></div>");
+ out.print("added this on " + result.get(i).getDate().getDate() + "</p>");
out.print("<hr/>");
out.print("<table>");
out.print("<tr class = \"container\">");
@@ -341,7 +350,7 @@
}
}
%>
-
+
{{user}}
<br>
<div class="popup-box chat-popup" id="1" ng-show="isReceiverSet()" style="right: 0px; display: block;">
@@ -351,7 +360,7 @@
<div style="clear: both"></div>
</div>
<div class="popup-messages">
-
+
<li ng-repeat="message in messages" style="list-style-type:none">
<div ng-if="(message.name === receiver) && (message.to === user)" class="talk-bubble tri-right left-top">
<div class="talktext">
diff --git a/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/DBMarketPlace.class b/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/DBMarketPlace.class
index 1e0163cfd7fc25fe3a7ba026e6a2ad1fafa47b04..2d4880d136a4e116e5424a53b14b97ade5d088bf 100644
GIT binary patch
delta 146
zcmWO0I}*V_9KhjUw#fdovtu{`72*+Z;!O|-QMiC(=(cqSV{{6mb`g~;80o*_`<jnQ
z-@nHb=(9KEscJ%@W~kE;nnEPB3~f3Aims*?WON`54I^UBSeR(0xAfq-t9SBemN^R-
ns@PvzO03*b75%j(VdKs!^0$^9>HVcHs$eA1<OGj$R!~&_7q1rT
delta 153
zcmWO0%Mrmq0D$2?d)VFV?12iHG2<;>LA(iqGK?0~pn<(=z|pwnpa6|HX~D?#|1ST>
zd`<HHr7s}lXvk4lG&D^^i$K%XbTnN<kG_u}R1AEEj5Lv9%tSHO%oOuSa`t4VS#Wpn
uA{Uk=D_0VcTw997?j#CwW7)EER}sj>vghzj#ZBbPI#yIP9@XqbQ2PU+4j0J)
diff --git a/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/MarketPlaceService.class b/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/MarketPlaceService.class
index ad801dc36eb26f8f17ef07d1e3213a372bd7674a..48d8c8e04f624d9512af5aeffffbf4b026bc41ed 100644
GIT binary patch
delta 3334
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
delta 3386
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
biXpJhv(h|%DI6nsE~mq<ME_rR;y3RDbqI!O
diff --git a/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/RestAPI_consumer.class b/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/RestAPI_consumer.class
index 9b8c42de6e80e91a83df10f66f7bb24c96ece632..bcefd2a8bd2f3a3f6c2f44d578c8417b01f2de43 100644
GIT binary patch
delta 268
zcmWm9xlV#X6vgrXFv|6t3=;if2wyCytSmJ|RNTb{_Z@IwS}n9Dv9Yl*nTN0@R$BM~
zK7h|)XJtp!ndVoVoSWS9mHo^%KYridfg!F83FU}96M@OVlrU}Rq#T$D%nEaci1|Q8
zSP&M4C4*(z&`s5lVI{CCtQq2P8?!EK2%Cl+Tf(-mqex%h-QKjCKT7Sohtz%79{ZL9
zYOY7eQQgwuP?5NnN?b)3dyhD_6gUZ-TF!j&Ne}3AF5IggR+lf|`cV(&g%KeVtdJ4^
dFm3vL_D4TT{3K7V14W5Z_beqD^W#&D{{tJkDi8nw
delta 300
zcmXxgJ1>J#9LMqR>4SfIa%kd-h{j+LlcbAAT6c<~Zl!K@>4UnIU}%k+m~AIsgSoL8
zyZ|r2X7>hcg69mDPx8P0hW~r)Ggg25d3gl}xYWeSMCoGMG2@sOvYKWxjycD?u%L;O
zb1Vu=!m_ZUF|2CZ$ZJ|zbF2#mjqh%KHiS)KOVi1=up<-|E!VZ`O{4y${IK2)bN|z_
z;ij!c?tAyxHylt>m`ZRPB(BQUL?NFu^bi;hIa0)JL&a^<8*D$O>;@-}Q^Of0d*}6e
z=Tz*ImsA(eAKru4pAyo-kT5Ka2&3>#N7(zN8zrP1V@)W=nXr$NmdWrr5vKkCrn52Q
diff --git a/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/Validator.class b/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/Validator.class
index d89dafe043b26783e2285ad1ee3edc910f8ea011..1ea3b4d947c6a812f9088f66551d0d9a60108144 100644
GIT binary patch
delta 1438
zcmd^<NlX+$6o$X*nc?*m9rjH|Awtv>!9=4b92DFT4PuBWBH}2BAOa2pu7Eo(xM1Ug
z8}44bC^t>Knt1Y{aw5T_H)Fg>#O}eFizHr+CYAra)L&h%>wDGxt>9xp@7o_QUjqwy
zswt#K*s3w8F{yRqHdpFQwwnY^c4+e0Db#D?X>eti&?xK{nl#Pq(X_DFPb+P1)-LQ5
zLYf3RG#P|7>2$i%CG6J(sL`d49uN)+hfEG@ayTM%o6L7h_4t`buW(d2W^&wp!8&*9
zgvm)ao-#S@#y;W9^EX*a;@UdH?VVwJOuh5B2SXhVAw|ADuCnY=quUO7hRm~^vp7$`
zo$4*}T;QU;!JF#8WO11RMYdgTWZQk-iog{Mn|@)?;wsmK>lQZ{vbf1D`>S_x`fcu5
zEaI*!!xs1GSIo9Qsm#Q(%Jt<Hk<u3Td0^N3ssayrq)2KGb_EMtf~}2(mEllRYoo<u
zo{W6(eeqQfkxVfQ5S}^NQkG#d7RgG`r172Qj;oyWkF&zb43;p;N><^ai1)0f6fd>B
zU=3yX7@&u>tRv3Ov5I^1gsBlPPAim<m@-K=anWhVbRBUT6EP<+1!IDAXThXXOMYMI
z_|c7Kp{MtSfH?hBxk7Hr1T!PMdECeHphTFPgrAL6jSQz|s*$t=L;Z<^^2RuPj&T@|
zaTp`Y;Z=-7-!Bfy8Gj3hIn#336y?y6{9kj}9N{p-__wb@{?sQi-BnOjJHKOtEk6PH
C56?gV
delta 1439
zcmd^<%Wq9l6o<ca&OP0y+tF$%r4I?AqvlEok`8Fm7I#9l6h(1MOCPwcXIu5EH|?R+
ztLjycdej|ANEk|t8%9k!H8a3OqxSC2y#wwaAS5Sit?aeeZ>{}hpZziSYi`SjpReBn
zbLf}&2?{DDCP9a7+HcpU%Awj}hr>?EG-?F3k}=e2Q!m&h*e%#23DF>FWN#w-*sr4l
zf`fuXk|dfW6KR&D(W1>^L8~N#pe$DQh~TK;n8R^NHYWsa4zqNtlZoVTN^n|m#^J0U
zuu3nTb2zX41&52;w+lM@-=`Z!j`z+?_nPb^FWKx(sA~w-H-x;f*^{j_)!5Nt)l`*g
zf=F8>@2#@B9FI#bm+ADrS$UaPxN6{5S2R}mYl9(w$;yDsT)JGYaor2}YBFxP+@w=*
z%cYy!f*zMU+;zFfeQ&@wFZBVvy5gZWk6a!r-7I^i^@KjJ&@Q!}^33bD)2!#b2*0ww
z*kygBuz-a)430+mNG9-u0%l{Va}TjdMJDt4#A23Uk;edq6yc+smlU%Un|7L6#&Qzq
zQYryeAv)armJ&haD;2E95UfcZVG0S+WtG$!L0Kd@j3Zb(Oq$v-qMC|7H>!M8C<_@s
zFIXp7k1<tHo;pnCsG6nAN}xcnVH}BUWK+0x{3Ij%eXME3$6)wk7(T}^48<@E#xT5z
wVQBjugSR62Z{aW_E{BRJhoY4Kn#1N%4wKD)`zlP2{1Wl5g25K`9-D0a1<#iAV*mgE
diff --git a/MarketPlaceService/dist/MarketPlaceService.war b/MarketPlaceService/dist/MarketPlaceService.war
index 72a56f1906956d0883b8b0e0ede390c4629b1b44..c4a58ab1945b218b6a178f5efb675e38a8a550b0 100644
GIT binary patch
delta 6067
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
delta 5477
zcmd5=d3aRS75|-?$-Fx+F9}Q%f+4^V44WijPrwja!V=ab5ZRYWGJ!xAAOS>{08&I{
z5w1mKGbmbA7VTJZMR6CU79n9NQl+h0D^lwMY9u}PO=dC)eEqB6S0|Z!&z$?tz32YU
za?gFoU$(w**lJ{rwAyq)0Ov|K8=b}3(iNEx4Bj<hbN?cH_wI>#-Ft1`-`;Yzbn}Uu
zRePl?w=#jcscr)GQr!j`rn(v$Yh`KK$<nd8nx)IKoD(G>fcg%Vn=|^zhize_lJbk)
z<>kk&y?6vbFJ$UyhAtXz5$LKT5lI5c0^J0<>*#@=4p`7jLvIKAAVnZmM_=^QaH~L?
zhW_5mmVC1FFmq&%t-_ve;5H19AJ|gu0}Z$^Na`VN?Sl<uV2Df(NpcJ|Fbu;9F4@lJ
z@~#b8V(HpJ4ARh1fY6CGvY>MVB5D_(Z@cQ5(gRT6k>)Nwa62m-?}8TVn1gB^H8|}+
zdz{g67Ux3oXPnpYu?{<`1um%mF9M&a{!@XA0)Gv~-|%-0pXrD|btpc^7aIN{uv?K|
z3T#pRKLrk`{wsm~0tW>yg`)Cvd@WEV@T3kWE-UeWY4}Fq-x|Kv@g2U`@dK_na1}o)
z>L>LW>vtAE3)BkyqT!m3u0B>B^9h1TkVPje*>nmayJ|Fzgia39b@ZlCL583(LE$<)
zc8U<xOi*({PC=1^q69_rZm5Nz7@nD03c5*9Ebo<C35wIHHMJ4cR**|jJB{K6wHJ6p
z;B|qw1l=s~rl15t9Rzh0)Jfny9i!#fj#w7%A*iRIUV?fH>LVycP^zH58ujyr>NZO_
zKGWz{jnXvg&k%THj5W$7z9meMN5{v?Lv2FjD`B5n8CdV`@NLAzHE*A0Db`l$2Hi#j
z49rEbMgt8RM1wWTFlY!3m6vD6$-R+ju3^N^5}gq5DqB$CS>VcB;wo@gcw7aZ@_d6b
zX~dSOyw1G5K_h7tA##p;kvn-|MNx6`zy%B3OGXuySFl<Jjixb#F7iZZmjr{xQkFs4
zlw;618c(pP84b#%+YOY^1cN5hBpDIXQhpUx>Y8lO6dIw?RD-6`bd6>hG?Uy0<q@x6
zKsoZx==noEYOX@cA+QruH^#!CSu{zb*#;HS9E0XkF~MmnS3bWud3;fcr@X>lGEbut
zHCU<^E|W<uDy+k3o_wsul(6}fMX-z=sYVvau$ZYa!>F9#$S+%1T2Wjy*P~H|K?^C%
zyE4W~w8*=r<te@LZql%>7V#SHsYRrQd#}RH!F3;5u-=TV4cN$i6i3-6R`vdJRA4g`
zTgoBv0FT65`PXlKoMjE<@&<ARlUwm1Y$)U1Zbujg6HxUMA|@U7o^GE+)@^u5iiCl=
z+gS?@cbn}x)&(34GnF>Ys9u{LO|{wDSQ~@U^lPJ3*oj@<-3eK~CBEs<Dt|W?^Hw-M
zu@Vo%ig5f6Rm`(tEi2Uw)?cto!yZ;at?M+G3+0LGH^0-|bBv|&D)rmn&D=-usJE=+
zMXKD3$9Sg$uo{o^65$xb!0p2m9QIw<=*xIXgQ5|QJFo;{l#J$J6kwnwbutxlpe?n-
zll+{H4it;0m<nb5vatZ=tg526Fi&|<Huf`RF{uMgS%FGs9%RyHG7mAuDV=$0{|rA<
z%bC*Ppy7BL&oClt|AnyE;Vpz|@R@?G(d7U4!5rXcWYi%Z#&rUf0l5YVu&>>B6;6xZ
z)QXSzt>`uJ9iuhiyQP8L-#{K{AP+W>hZ;zyGDf{!lp{QgKgdtI94k;DGdvjQhmoo0
zP{~hNkd4DkSxh9Hu+*{jIQ48N_9^9qO?}~6Q`caRdyc1h9xr&qyPlw!DxS;EM&E=x
zu@sz^eI}MaBqmoLGS^wddKfGcNe=eL7wdhnE3`U{g64yiSN4U(IyQ9cS~$!Q-Do=J
zkF2XNNMC9S=<|L+U%rvUM);9YfW2ZO6DyA=J^jB#=an0xa|Ew?KTWn1y(Yit*0EAq
zgFO^`0@m1L`X%p`dCD#p{(IQ8i`BGCva(ANL_In_co-pHx~M}t*!)AL)tVaZNH88T
zW*!SlRmy-zIf5VS9&PFWItNG?GVvweU@9D=@tGNC5$q@z&ERT=TwK7LJldR6>myi4
z3+jm~d8KFTN?)=8P3D*~qmrq&nNmSH8SgNqf^st6Wl9C*WW2|e3d-!Dpe#m69Vbwy
zZ(qUj=cfZ9rcm%R@6jsF;05X!LH)l=n^^r62+g33chm$dI3k1a3JS8f7`pm+d%K==
z@gea}1N+?u@;xSx;X!YY-h~wEbAl+&jaBl|K7+G^Pl14C>kk6wPb}&4dEZeGr0KEi
zJWgr)K0c5sDL<I2gmAvi<yBHsTNn8cg83%WKId}5R)+})3BpQ28vw`A)SKQ9_NJ!J
zq`*0jKYEX(awVoVX-5m5tV&+%8*mL?{6pNu8Ogzigv!Idb0`V+YZ#)T-mvXej^zre
zJ}I-)H&V-&PJ@s*ZmJc0GB>qZ66?m+`H-XQPaJC&oCs{~BOW?gj#I%kwfEhA{j7Xp
z@Y>Rs*;T(fV@IfYV`%TJdGZSlstQJ?S!-90Z`P#NMzM}qWH@jWhNxz!YKCbTuCxDV
zsD`f;AsC@yq|QK$Qq5=$>~mu^Wa*qEvvrQY9G$~)oNC5v$kh?4WFv9Ah6x%b>WIN4
z4U;uYp-|Y%7FNt#SV4%}GOmp`F8d>j<dLbof`8uOEF&-HtiE{~rW=@nnFPZuw@N(~
z$+<bB47lJnkcWIitXwgJ%hGWv(FO3RfkM^HGB8_-wUc{xv<opfE6tJZ#`m_*MQ1`!
zIWViIchmUs)~<au^Zuim_a6=EKrNz~SBE&|S$$P=n~hN)fPpe%V!y~irbPxfGQiY{
z3vFTQax?7QtA*dS0KStKrsh;Wqazs}4TU<}&?7KQ^|Mt|Brr!{u2A5|qeMfg&h<l?
zYUXK}uVI0Pa-Gkog*p~tu|pLiin>$7QVq)#;LACeVTH~?Q>mJj8dm9O1&?Z0Yq*Qm
zUL)`u9c{3d%Qn6Ps-@OB&`~8GPDJ+!tXB#aDb@yojjG=yaKGv|YuMubdfEm{8?)pq
z^()1z7xGHx{A+j`xpd}3f@@8K)5}&F=f1V=gV=VRvHIX41KY8~Z>;;>S*>;&*oCbc
zb{m`ktGKE&RC#8AOEc4$T$mYrN!_QKCk(E&wl)~^DePxsww3GiQmhAXP`X=1vWXAj
zY43%+d+n9E?1ARL@;+t2iOxFqagNbOBN`_825Z%cHQBU#ZXH{PPxqz|^0<GZ)+$}!
zXq=s!y%^M1!!&0t;`pgLP9D5|F2FUx^ky77?91ML^J2)`dhSm8m1vr9LrvX&O-oCE
z<(lT1ntCn&Z#cX841Xgy3HfH;C<x9QE4&>SeLvMq9G5QrymmboR_kTwlWC;O*(ZC+
zT_;mz&B>Auy2G`|v!J}Fth9f8&!q10>AH(QY2}`B#Y@aDD=jRVl`e}<#patMYE*rC
zb_@JWOZGoq!FN?ozx8tj*!7d>X~~N{d5P|M^V0Q3nr1#e)}SM-;1L;9?F!M;+9f8+
z^y<-aeRYa_vpS)Lo|u@fr_HV?DXyP-w#QwNF0D1U$mE)~a%|1m7@yk7=75jRD=S!%
zE}yUI(7t}mWUvyxd9p^5CCci5nI>(g`v%^o$swovsdr?nPMdGc4xdg_zrH^`Ky@i+
zGE}$x%mmfdoS9+1MoT@LVnQ8wjV70!o#ndjl@y!F|Jl2$g^+GbZ^>_{<cM=lHQV%a
zah7xaOzui&gnaFs)10DuZpwTYSBdI7z%S1|PmyjuoE5IgtaN+V;616e@7~#AUpikM
z)puYc!3Q!-!Ht<hewcB+V576Wkzn^MQ;?5(8Fk)Ny3_eM%gTu+cj@^kQ{li##ix}z
z()^#jtFBBnA2i||^3r*y30>yLtt=xeWZ}ojl}hJ;v$8)#_yxJ&yK3+WV8W0=iJ4=D
yDo0AXqola$h69eo!fe{WXYZ=okAR}m0?!>u%KTX)Ll{f-aw7^ynYwsN{rV5Cq>j=6
diff --git a/MarketPlaceService/nbproject/private/private.properties b/MarketPlaceService/nbproject/private/private.properties
index 17b05e1..28552d4 100644
--- a/MarketPlaceService/nbproject/private/private.properties
+++ b/MarketPlaceService/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=/home/khrs/.netbeans/8.2/config/GlassFishEE6/Properties/gfv3-2049786751.properties
+deploy.ant.properties.file=C:\\Users\\Frys\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31137312071.properties
j2ee.platform.is.jsr109=true
-j2ee.server.domain=/home/khrs/glassfish-4.1.1/glassfish/domains/domain1
-j2ee.server.home=/home/khrs/glassfish-4.1.1/glassfish
-j2ee.server.instance=[/home/khrs/glassfish-4.1.1/glassfish:/home/khrs/glassfish-4.1.1/glassfish/domains/domain1]deployer:gfv3ee6wc:localhost:4848
-j2ee.server.middleware=/home/khrs/glassfish-4.1.1
+j2ee.server.domain=C:/Users/Frys/GlassFish_Server/glassfish/domains/domain-client
+j2ee.server.home=C:/Users/Frys/GlassFish_Server/glassfish
+j2ee.server.instance=[C:\\Users\\Frys\\GlassFish_Server\\glassfish;C:\\Users\\Frys\\GlassFish_Server\\glassfish\\domains\\domain-client]deployer:gfv3ee6wc:localhost:4848
+j2ee.server.middleware=C:/Users/Frys/GlassFish_Server
user.properties.file=/home/khrs/.netbeans/8.2/build.properties
diff --git a/MarketPlaceService/nbproject/project.properties b/MarketPlaceService/nbproject/project.properties
index 92afac1..e1f402b 100644
--- a/MarketPlaceService/nbproject/project.properties
+++ b/MarketPlaceService/nbproject/project.properties
@@ -40,9 +40,9 @@ j2ee.platform=1.7-web
<<<<<<< HEAD
=======
>>>>>>> bcf1435806005cb1ed3347eeb593de560332f805
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
--
GitLab