From 11e4ac25b749da73b0b773b49b15db5d2b4ed0a6 Mon Sep 17 00:00:00 2001
From: kharisisriyant <kharisisriyant@gmail.com>
Date: Wed, 30 Nov 2016 01:01:10 +0700
Subject: [PATCH] tes kirim token belum berhasil

---
 ChatService/nbproject/project.properties      |   2 +-
 .../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 6725 -> 6689 bytes
 .../classes/org/IdentService/logout.class     | Bin 3611 -> 3590 bytes
 .../classes/org/IdentService/register.class   | Bin 5801 -> 5768 bytes
 .../classes/org/IdentService/tesKoneksi.class | Bin 2237 -> 2222 bytes
 .../classes/org/IdentService/validate.class   | Bin 4753 -> 4717 bytes
 IdentService/build/web/gfv3ee6.dpf            |   0
 IdentService/dist/IdentService.war            | Bin 892870 -> 892806 bytes
 IdentService/nbproject/ant-deploy.xml         |  41 +++++++++++++++++-
 .../nbproject/private/private.properties      |  12 ++---
 IdentService/nbproject/private/private.xml    |   6 ++-
 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 1994 -> 1976 bytes
 .../org/saleproject/KAA/UploadProduct.class   | Bin 6429 -> 6384 bytes
 .../org/saleproject/KAA/tokenParser.class     | Bin 1172 -> 1169 bytes
 KAA-JSP/build/web/WEB-INF/sun-web.xml         |  11 -----
 KAA-JSP/build/web/catalog.jsp                 |   6 ++-
 KAA-JSP/build/web/login.jsp                   |  40 +++++++++++++++++
 KAA-JSP/dist/KAA-JSP.war                      | Bin 2191905 -> 2195657 bytes
 KAA-JSP/nbproject/ant-deploy.xml              |  41 +++++++++++++++++-
 KAA-JSP/nbproject/private/private.properties  |  12 ++---
 KAA-JSP/nbproject/private/private.xml         |  11 +++--
 KAA-JSP/nbproject/project.properties          |   2 +-
 KAA-JSP/web/catalog.jsp                       |   6 ++-
 KAA-JSP/web/login.jsp                         |  40 +++++++++++++++++
 .../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 5725 -> 5695 bytes
 .../dist/MarketPlaceService.war               | Bin 56126 -> 56098 bytes
 MarketPlaceService/nbproject/ant-deploy.xml   |  41 +++++++++++++++++-
 .../nbproject/private/private.properties      |  12 ++---
 .../nbproject/project.properties              |   2 +-
 39 files changed, 240 insertions(+), 47 deletions(-)
 delete mode 100644 IdentService/build/web/gfv3ee6.dpf
 delete mode 100644 KAA-JSP/build/web/WEB-INF/sun-web.xml

diff --git a/ChatService/nbproject/project.properties b/ChatService/nbproject/project.properties
index 8935b2b..2f11d66 100644
--- a/ChatService/nbproject/project.properties
+++ b/ChatService/nbproject/project.properties
@@ -34,7 +34,7 @@ j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
 j2ee.deploy.on.save=true
 j2ee.platform=1.7-web
-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.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.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/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 bfcfc2c393b65178e3fa12c901b8895ff41a854a..31a29c2b45db8fb6cd6627bb6dc3d8408455a93b 100644
GIT binary patch
delta 1500
zcmaJ=d0bRg6#l-MVeXkXmtDm%83aXBQIOEAP)kLz4K!My{s@a-s0jT8Q`8!@w2exA
zSt_(l(w=3}qE@DrR#sMKnXR_3wlB6h-K#|6AHCmu=X~efbM8I&eCKT`h!#Y)?ccBw
zKmjWpRAG(6{SG{MAb?`56+9TkTs&k&o8Vyw^YDn^QNd$^b%OPR4GNDtNW>b!6IMSN
z#2joCJY|hdg3W@bZQ3&m&pHTUi(sqZIlJTY3NJVjgt5lKHoO?bD!e3EVmEkMuvD;J
z@QUD7!D~S@V@D7zcwMl->YWY-;|+y3t=?tDTUP8=c-z4{c-KKb-m@2Z-y&ls;se1R
zt3MQcWc9~_PlAXv<5R(Bg3ldO$rplF2VdeVYizQ0e=Yb%uvg(*h3_1Ej~^WTh@S%Z
z8NXQct797Vn_!>dcU$=%*8WrQmp$Td+r|A3$`KR7Xwt;cqv#d-gmJ>2exVYIFd%e<
zL7^7L3lkI*+g5TNk6@BwvSNzap=kDbRTnl)sjID5OjYdCHp5#%VOPa&ifL_od_`n;
zx351VQ!~UK+9dZR5(_iOmW(MYFD>d--7vjoq-HvMxHbOS6T-~U?1d;1SD0Hp#H?gm
zLlx#ut~<YR<N?&4l7(qR>eR}MDsyWpYcI$xtDaFet8#Kpm1b}Dar0EVH{0x5sxp%L
zYWCxin*BLIb0Blvg=%6K%|RTjnae!QA<Wl2iUsaol@>pg!!(cPaLr?QteY%pU5~S{
zP-7}bXpTfwGt5!$2<bIE%;O1fR!)|6oj`c9`fHA6KH;x#sBD;7Z(JoOX^!Do#Ujmd
z9Ishy%33bv;R%{2BC2TCPv$9#r)rk4RC6LHY0P(ZAUpRo=4jlB)dYLnBg!<YF-7xq
zo?&`1vvyi--K<*8GkKO~IihXn26jkAvBDgMxeD`?8E_gA9A|`ahhj*EQs^Af5#^1U
z0rhq)o4@d4^ZAYQ5=7v`{I;f)>E6f!EHty@VizvOWw6t~9gB=lqZM1R*r0gqzzSTB
zE0BOaxC&RAFVT$g0$hzIBykM-p&kuL=1im<Kn@1-99)BI5r<laaGi<sV<;zKi9rgZ
zSd66x2^#w_0n5zs0WQPJ1Ickn_axwYEQimNXKr`{Zgg9^Wk*(+buSvt9d;uzhV@A3
zxSK*)VU<F&LixXMi)qzh5=f3A3g`c0ftYD-++jh0Cx)}zTO2va!oh?7<6?XV7pX`+
zEWe#IQ*ry#!Hv&y<2y7Q7_Bfqr4vUtnKVC$n~nB)aErS+tt|ae5)Ta^Zbj71?>;QK
zv-dWvb{o4d&S*9L_8@>f+-{K9FgO5r800fPGm~yOv?$)%aY#iU+=V80Z73AHn;f*y
S_yqU3J3~{|y`~fo?)wKmyBs?J

delta 1592
zcmaJ>d0bRg6#l-MVeaM46$Dfmb0yS7an#T#QBy=HE0?fBZ5eSCa2!mA#I`9-+sumB
zBBhmWq;1x;sFkf&T3OLzmX)?@W&2`UPUoqS`bY2g-Z|%<Irp6JobTRQmcK4Pwqfs@
zwE*%t)j|kyg~u$o@OUyx@r1^cKCHrON379!%EHrlMq{nUvl`E7Jg@PB!iyGC5!ZOh
z(d&G88Lw!(>MYi4Y|wbk+4j1^8y5W7sPU%8TTaHe6`HLWIw5Z19lYzqdw5@?!AY=5
z!`ApfW3$GG8Xx(v1t0tH2|m@B=jg2#`e2*FXO8~d5nnjsONFm2e2wiE`eTRF$TyB9
z%T#=;@tvc0YJBhLA2fdSA+`lSY5c75izP^Y)mUNSH~j7_);qZW(AcH%r^0T9Jr@4L
z-xl^FkxY<c(Pg2OZcUG7k|3woSu0H~C73Kzq-CL;K2783R!&TcVyb3q%{0vp>6#gu
zZ8Y0zw$sei%+mC0wpTnN-pEz#iam-Q6gw(*k|7dSaeYN-X0)m%Qmfcmu}eJcp1?L}
zR_v;nEy)#+l+g(0_(o4LOL7dRVj7Vd4b?{jmC+gDK^2w3S+$|);PGW6^9m%lVK;U+
z?7^dm)WWVKMi-Tpk16ir#14_VhCSKcF7wuB<+7KcG3<>dBB?M?*>8wp9-8cJ-gd+K
zU^<ae9Xu}>2nQq60%eu6YGwx~heL(|_9a>eXU+^)RRkUEf$G|th@_~CPR%PY?8ojz
zdwYeaeOtx;hDS4B+A$o!friJhz@DPU3X*KYV|kqPXE=z3hJz{Phw^wLeP7wSXjM2+
z6by$VQ-ZS$hjF-J5l0vnbELgfWwtGG%u<7Do?v()nhbL}%J%Cn1-U$laA)_H61hB?
zaAo&2JcUCDZ*4Rft*aH+=uw8FIYx1;;W(aZSSDjRSC@AhZ+IG-6i+uigXM}73@37u
z;h8+kV6MGgcMF`&0)q#!TuzRl&*eD=m8dcdax$UnBGV%^vm=HToMIS4Q@k*_Sx-1$
z;R1yV6)sY^7!=_fDWX)q1k#`s4vlDuawp{QyIX#i8y=I-E6z)BDLj}PuS}oej?Kem
zuwY{o=3@bTSb~kXTzm$1%Qd`0tX62oVqA%<kb<ouuf{^TJUb-GHCTk!EJ6>|B8oKD
zA$^}^p%*9NT3m-DMCix$66eJLjzfc33PV{c6&FEcP7YIW18zhz8_>9Ka}qkbQg9P)
zhR4-cI$VrKyS`nw*e$pfZp@J$HX}8G)ktaSO<{?`Qia<TZvXeaLq@fX1kw^%2J8Q0
zfrR`sB^?$7xDuFnV8pTgEbK4z9~UJpTx1~Qu>A)(6T}Ce7H&KaH=cvTf#C{wrXRx5
zU9!y!3K5W5;2wKvW?9FBNjx}!xL59AO4h)%L%sK5xjjB>LFW}RZx@o$7x#<h76x<i
vfLI>!$(giwXU%Wrtdo#|96W?Y_Cmkk_b{2aOMDtD?Unv&^@u=m;n9BpwrNAQ

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 1279c9f4eb69f01bf2b805ae125f037bb43fc34f..605a3c2578231d0e68c006d05d8c2501c9690e22 100644
GIT binary patch
delta 739
zcmY+CNl#Nz6vuzBrQFNwMIy#Tu|`>#NHnP?L|s%C(jtgVT8Cm4${+;`MOsFOiUSTf
zpie}_2^HrFQ5P;;xiGHWyYK@LzXEt4F$5Opoc}rhGv%H;>KX8)eolY=2ITX_WCLN7
zgB;2rj~Yp>8$S_S)k*420yIb(C5I(VlBlFv&|<QPu;hqsV{Qs*m9*JTT+%K%YL|5g
z5+=(?N~-LXPC=K6hp?NHZh9oWl0G-bI4(IMIcak#$tg*>4da4-!D*8-oHaSeKnCZz
zV55ts-t>}WP;hzTN6N^#BDgBJW?%+->KogW&GEK`U`TM?YI2MjH>@n@P`ahK$*?u<
zT$QW1#faiIcMP(8x&Dg6V5l;%I+|>a6)5g9Vof>wsz$k|xKGHy<?}{2YUY9M2%onu
z-q2exi~g59B;R03OQb8}jYZm;yuoNkygO1CYg9a9O!1f}207N0BS#9JD#m$c{Z8Am
z{JG)<FAdTY$w;y@Vc@7JRlMT0wch1l@ka5Mkl>x-Js$)UijPbxKJj^S(DlbvohK+1
z_yqx>-`UX0U8Gg9mKhc!1Pe3fvYazGaL&>CClqN(*TL-+lSYa4-95c-2c@{!tWUX<
zGR@ZNtCVXb=)lCsRwVs;P6d_LU$v&JN^?%Kb!->Ab(d|rrw7LjDO_{21VN#rdfBzv
o3#RUw-N0b4wrT9MYBGZ>=WjKiH`q_e`jxq9>B4BWu61zWANcTyJOBUy

delta 734
zcmY+C$xl>45XOIR-pq9KrqM`Z+{S<hV~hthG3sIDAdIqzgMtevI>Vx%z#uaq;4-c#
zu4ua<isHT_;tJ}~82<u2`JaIOI1o5=)mQaZ)mKS%SFkUb`aL%C16av-hvh^aVpOHE
zlxj&$fLivtW}l?ap`QJc1Cj<wqohd^7c@J}ASyZN`j!9*l9E<8Xp<b0w7YE`f=-9I
z9F~;2B}W8D9fCvy6dWTZIW9R7;3TIcrzK}xu1j)OQsTlk!8t*<!+9<^T;x(3m$~Ai
z9>;8YRdP+Bhkm83tZu<|!41JpBWdA;+pBAvllAeYgy5FowvKrQM6Z!IBeiY!`0ptC
zxT|~Z%q6BzagTn*eI8iM3@yrw<d&6}gtO|BjSV?wrec78{nzfye#j%Eq<BoFg)fv{
zw<1UJ#0^9!yDDDOku!lN8Wm4<$~#{^<GJDmFZF;o)Bj5Gnm78Vcg?)Fib394_!G%k
zvNd7hi4-Y@c(3R9@)is$K2Rz6sQAQZ!576>Miirb8*cOc^Ht;u@&sYQdcg)PV*)P9
zH*cI-2*LD<$trss5B4N&K0&^Dev>Sq5HCe~Ffg`kBgObwO_)tY3>!5EDKSXUf<uV4
znA;hh&1}(s)Z*e&!`Wn*Tp3%<lyzoi5YIR%e3M#&ZG!FYvO6-Ssg_S{U{PVbmz}yW
by=>vst)}u8yQtKo>8oZ>&+az89`^hP9=VE&

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 1c9ea990b8b887fbabe00a9f33084292e6fe3064..7a2a9b0ce89fc92347cd547e313812f040103aa9 100644
GIT binary patch
delta 1255
zcmZ{jd2G~06vsbr+wM$%JG9%D0^L?iMZB;sjYRpQX(EVdN>cwoi2R|h?IOK)X?I&e
zEQ_2~5rrRC>wTeuDB$8%74HiV6vPV!#S_I7ML=ntUt>s#F`4<k@0)kbdoMGq%R9?c
zn|pgU0b``XVJh8<TO54cn#~k$)7&1QkvlxNQ*)O?6L)Lw(cG)KPqRvMzv2OhT)H(6
zdUADu2G(dE@|3ljhc%CQVe1s@9g5iC*u;-2(henbJES)9Sb*g`u9@$JKA~BlS*Tg0
zS*%&2>C`-_c}mk0U<FSHSjjV9iO)KO*`#>Rlh1qbf(I`uUUGPuR~$~~RSzu7<u%Rg
znm4=@o3nY7w={1%yhF<NGuO+xMf0xb_?`z_HQO}rdo^y?eBkgQA9>1Jua%EApJ;Yy
zKGl4t*{Rs2_}t+Ob~}8@SJ`~cHy-;|^POUk;(H+{8E=fnCPrh?)<`nmDwIx&w_X-L
zFWn(?B=mz~ui{6+nJ}w1Ix|@xk0lg8DSl25%h)E)FN$9kzbW>)y_qrj-EGb)Ei?SV
ze#4&}5OOQa&aN3h`NH!j44;u~ZmKdIWWSrv>L}+Be;NL!OUSAW&#17b!=9ol!<WYE
zW>@vIe`9*xOZ-KOKEaT1=lRQmV#FsIMlvPKh+mYu(O)&zh?Z<4js%Ptx{M5x93j6U
z(jE!7CF`5Q<0DPcSY4#mNUj8p<Vn7f0vYU%Rzrh@9vxzsCPNK}WSBcuHH3;Jq@>tT
zD<wi^GMcDRa*UB<CFJf<r4`n%)N>v#_!G%UvMnL_YO0Nt$#J%={?RHKVdQujY2*ak
z`6#`#_(UTo(WT^MBd5qHC8ruGm(z@dWpsM0-mRuhQ8XwT6-~;%OtBC+$HKXG_mPKE
z9PM$$E2Gc8zl<Yh`+b`2_S?f4aWa|d=HyK-9(dN$Zx>pv%p{TS$ZO9?C21qb28q+o
z<@UlJna(U`lg~~W#}&+>fW0z?E9qdctfPgw)>_C2Uok1>*$bD+daklr6y?4==3AyY
z)2CQqSvF_MVHR5EP%ZmdWLba<WDkoiGh94YcCp0LLDb83IxWkgTUK#3*Vr!*^i86c
zI$Ld_Zz9*Slq_Gw7I_`Z+%<(GQ`d6?8PwZ;rlb4VLcx)FC`$Tgx?HhB;r`EB*?%4u
uPzR*Cj}ZR<W&qzoLgN%Q`A5yTB{*Q9!i{vf7Y#Y1aNwAQo2-wIoBsh8dj@X+

delta 1278
zcmZ{jdr*{B7{-6^F6=pcdxV8`HNXNgvKwtAp%pQcX4c@0{b4m(Q?r9>fVgY0kY%)1
zUhtA#zHUTOR#tXX!fsf0zu7&rds=q2G%LGksdPT3VepS;zVn{vJLf&m`@GMb(_Xf+
zEWLhT?>eADsvORyOL2#Tk2|wCi{+ZTg51qLURa^I*Wo_y*R0e$pm|X9kmg~<BMv!q
zX;yjj>LA@bs_F55)@UBnJnkKPLh+<SK2JH8xL2{(VFX<c>8E)n$U2_Y%=3;ur<t!=
zpjoJC*DTU3);zCyLGxmemv}kIE4=DSe9a-s>x%W>{Dv3a^uk+;w;kT$U5C-U=LL&$
zcwe(Y^MOaPF^doRNb|A7C!}pZb3M*aHJ^EjpL^j8%_hxePve)GuN=1UwfD2eYvmiw
zx0>%X-)nx*Y*qZI_{m`#+Z}#pM;5>EtA~Em>{R@&_(RA}C1=DF6XS_^Q!JHi5{f1z
zn=Xu=-qR*?q}b;CsrXB=%i1J36K2=OXQk?siDt!a#os-7{tXgdtN2H;N3mD2&o*ug
zyE`%x(&wI^Sv1O?H-d-}pZJBGs*+PCkDqeR854@@QZpN?Ew_;j5w|O|EnhMvU`rZN
zbPAbO(Yo?#BbrXPJP=Wm#koS*U7j7*MjQzmTHLxoN!S<}BH31jksJvb$(1~}BT#L*
z_ZSJwP%FzwM1~m|PN$IrBwxsDh_%L|Evfp(==fM;JTWcSWTZd}jf{{3jT|IJZjKrr
zD)wNBVX7Q#th$kIrD`ZRL`sz$YN(Y_LPjdyT(0CWBZo_=+pCJoZQc=H@{vNIITcH_
zGz-4THAaq-GTT+Z<4TS;5|v|&l-u4Ny|nOHBcth5QeoscsZ=t?$XGev$O&>{Pq*Hp
zrZy;MC>j+r6$z|GiQuU=oMuNKxhTc{83S4VK6@?w1KajhCG7~<#aUcL22Jkv(3HZ#
zYt8-pLdwn=wDg>p+v-oZaxo#gCCO|qu?2f&I+rqsJT}QVE~AYw+oXcaNi$SdS?alV
zH^N9?Ay;svEx1fpbCqRLl=*U*XOU)%Pch%3EKZiaEU?I-Ms~8$q9A9=R@yBxTrgHP
zv&h0B)XPQ|Ta-<QtY8UC?aK)HCQ-{Yt2W}B$ki+((-*TMui;vEQKU3|9oOTh-u5#c
z-Dlrnc)$;Z+wbWOiW?O-{m*xE|N1QgYM0dXQGmUv1BU;{0KVN6j8k;v?dNfGXpo`8
Vt@c8nG^{c**k<82o8#m5e*sS`3vmDd

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/build/web/gfv3ee6.dpf b/IdentService/build/web/gfv3ee6.dpf
deleted file mode 100644
index e69de29..0000000
diff --git a/IdentService/dist/IdentService.war b/IdentService/dist/IdentService.war
index aca869ce76fa8f717cca7de4c0ed2e95ef1201da..092e9ac23cf38a8b9cf94ee2a5f00ddea3724c7e 100644
GIT binary patch
delta 1176
zcmaizUr1AN6vuzpxw&pTN;;=0p|Xs0Ugt<Gb1un3Lc~23C6(cF=18ZgloCBi|DLku
z=FT>qLP-!v1O;J8_T)nkMK8YjAodv4Q})<7zw6%$cgOdB?%DbNew_2W_be^eJY1}?
zc$*FBst{%&e$R(2W#;wyyXPW}$%asUz~pjiK38>U&YreDANqQj@9PzG50@%cjEhP=
zBdQ!Fy!og+FfyAmmL#*FJe%XXqKX1$pw^Jd3^s*rOhfxiGxJr~9qDt7{JKK%J^S(_
z`?5kxBN<5PBqPa0${?9Z`$#Hj|2zA#CH_8>%U*aKezIZ`V#S1?o<bd(Lhvn9EvCyo
z=pVS%;~(<i*f`|jS_BTFV;mX}=~?Gy`d_nyePy^d4!Nn#dFTw&_Hspk81hrB2u7h&
znxm1FUaGqQtq9rr?qd<KmF`u%*4xqF9|+#q+3|rW6=$7*d^|-@wq4Ec@;gvkXC@#g
zm35<K@@soqWv_DAw^6X|Y29vB`aK9%>CfFPcyKV#7u2rz1-k;&-zY*smQ3-R=IdA$
z&LI@GZ=KJs1*+S5+warpcs%O%$Isu-i&l&BK@oyQBOwC8PXBOa_fT(-yW~u3<M}r4
z*<y}7s=GwfusjAWI2?oH_&NrqHdWIoq35{@celTz(}O=^;K0H-6k%N)TJtt)k~#g^
z*Vj4X!Pz(*v2P^hKUAi^m$z9-vl=!>6o1B{c56t{m4K5pGuWGeYUc9<xS6X7XkgkW
zp@lgx2`89ylfW~E>J(gK-kbs-^UD-mVwNSLjd?!_mzk?cxXNsp*5l-~zTbC>|DL%E
kGvGY^zjLIcl-KO&0>X|{^)?%6T7}4=-)Ex`&*DJQA0?NKS^xk5

delta 1220
zcma)5O-vI}5Z-Mmt(8G7|25H;3K842AO=B-h=9ZpLQODA1WkVyXwn}-i%QfOLe!&_
zmOfhkLgK}Q7!pE=Uhu?$1JMfy4<6LS7(GZ#)Po0Sc1ug72e$e4>+F0p^X9!bPu6PI
z*J^U??aC}I$7wiDzY@-=(3Gq^yyANMDi&_=WLH)R&Z_G0qDfJ*5`K3=fr{T2d`HUo
zN}}t019~Dc{v=w<Z}`V5;x_fV#E0ONj_ms57Co`2PMJ&WZ;KQXD{sBf5WnoZufsIU
z=8<1L$YZ9hr=~3)p+G1RSqK#(8=*#M5C;%i#KBe5R!;nNE-m}pu=XdYIS$lpV;t&v
zV5%^DJ`7p|KDMAZbjK@(E&ywqgd&zZ0VSxo8ifjGp8&lfDYK?@8N$qRgoS;W0NuVK
zir9Oswo}L*f#Q9JEk)8{KlU4@XN^(N$<-Q<?CFTjN1+hCyEkB)Hsfy;it+ogm{c>Z
zqJAa8*d*j-5~SKgm5^DGY(z>k9+T?tsgqi_q$*^PpU&09pui%xl03&?&=c?rA&*ZC
z4C8r9=R_`gsw;s#VsO-zZeEtV0{%WvKdNokyP{KY3=ZP|^yR1f^JR6kX_MzT0*(ad
z@w>%)rw2klug%!f+1%A_Z#9rbNsNL3><@zuTxjbQoI`pr1!a2B3Ih3)I$Dx#Ky<kA
z+O1B3*_d9f%_oK&2G@XNC@6*+O0RWY7HUgT#>b%((@2q4IaD^B0rv>{`{PhvzT=m_
zVNc0=_I6&8uiTkuwiJiD)I_uGIGo1;V?qMX;@~k?0&K(!3Ajl7DFGeiKQj%rWP7Kf
zhj?QeZWEhlz)AdU25u04oq=xRmRYz-yf6#B$gw#zF-`BBoNf{A|L3z{9;}x#?Ky6{
b^gJK^&S2LG*xOav<jBL{ri$Y}#sRH=jF@BG

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 f5d8512..17b05e1 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=/home/khrs/.netbeans/8.2/config/GlassFishEE6/Properties/gfv3-2049786751.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
-user.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
\ No newline at end of file
+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
+user.properties.file=/home/khrs/.netbeans/8.2/build.properties
diff --git a/IdentService/nbproject/private/private.xml b/IdentService/nbproject/private/private.xml
index 737acd0..24ff876 100644
--- a/IdentService/nbproject/private/private.xml
+++ b/IdentService/nbproject/private/private.xml
@@ -3,7 +3,11 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/D:/Kuliah/IF%20ITB/Semester%205/Web%20Based%20Development/TugasBesar3_AngularJSandFirebase/IdentService/src/java/org/IdentService/login.java</file>
+            <file>file:/home/khrs/GitProject/WBD/Tubes3/TugasBesar3_AngularJSandFirebase/IdentService/src/java/org/IdentService/logout.java</file>
+            <file>file:/home/khrs/GitProject/WBD/Tubes3/TugasBesar3_AngularJSandFirebase/IdentService/src/java/org/IdentService/RetrieveAccount.java</file>
+            <file>file:/home/khrs/GitProject/WBD/Tubes3/TugasBesar3_AngularJSandFirebase/IdentService/src/java/org/IdentService/register.java</file>
+            <file>file:/home/khrs/GitProject/WBD/Tubes3/TugasBesar3_AngularJSandFirebase/IdentService/src/java/org/IdentService/DBAccount.java</file>
+            <file>file:/home/khrs/GitProject/WBD/Tubes3/TugasBesar3_AngularJSandFirebase/IdentService/src/java/org/IdentService/validate.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/IdentService/nbproject/project.properties b/IdentService/nbproject/project.properties
index c1341e3..f084e36 100644
--- a/IdentService/nbproject/project.properties
+++ b/IdentService/nbproject/project.properties
@@ -34,7 +34,7 @@ j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
 j2ee.deploy.on.save=true
 j2ee.platform=1.7-web
-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.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 0533d036109652331155f580b3751e4acfa4b4a6..7291845d20e5252c346e689d6d83c25f22edce8c 100644
GIT binary patch
delta 275
zcmWmAJ1@gg9LDkQ>A^4mlT%GJ(i8)WNz#QuQTKb@s&#4I{;0u#p~NB$oB6y8n^?r)
z1@u*zyb8fN%V&6!U-CS^R_Z;~Z2f+G0>fMwdMHF>nG8$?riB?pJB7e(U{07fL@Wdr
zg(YEGSTR^u4V@GXN!9}E!iFIoZqsZETSCc@VOuB*6-CGOZR6&(`K{EByH7j~?6POs
zr>d}*@m-v|syA|#Qqj^+&2qq@>(%A1BaTCI5{NCQRNbQ<)MuQ#7d@itZ(sUB4`qc>
jArh>R6yKX4x_$OXA4>c(Po@n;o-y|<c^UUVNHFmaYx^sl

delta 293
zcmXxg%PvDv6vpxY?#9a5*)(w?LJXJ~NjhQBx>FQ&tJeL}gH~Ij2E|C4c!e|Z8e$>_
z9-sq{;VA@X4@`c^`m)wHSa0!GyxIDB{{Tk0HuRJB=wrdL=vWdmhIZ19WygxJYVgQ9
z)`WFoL)bJ}whUe544rH{@<PGjyIY?fVOQ8Q^s+A;2#1P}`d#DprTL}&Xg-R1|JyRr
zW>}6r4IOi0Ii;wuwctKT+>{!LLN03=B(R)u9(p?8eL=}3WyhtZLNToCVO^ybKI<`c
s_4=tF^+-}k3FE?qFeyyIH$74I%K%D9I;PuD%rF~1NJ{3Suf&-D1I6?&qW}N^

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 6e50e3a5a8bca4fa92971654320dcc93e699139e..e9947b4f2d90b0b0d65f91b5576095848d3b067e 100644
GIT binary patch
delta 108
zcmbQjIg!)s)W2Q(7#J8#7)-brxEK_<7-SigK!h?og9;Y|3rK{8K@~)(fe3YW1`T!w
z&535;7_}zrGU{{jFlaOA@G$5y=uOUKlo8NpFyLX(XE5YpFk&!fWRRa&C%<_M;{zrD
DhFTEZ

delta 128
zcmbQpIfc{g)W2Q(7#J8#7)-esxEK_<7?c>4L4*oBgDMvT3rK{8K@CKxg9r_F22FMb
zt%+ve7_}$sGU}VLGidWL=rHK=Fz7MpGct&0C6*=X=OpH(>j#$<W#*+jm1gFoq!#fo
U7%&)u2qPW_V+NDW{ftb^0A^_x;{X5v

diff --git a/KAA-JSP/build/web/WEB-INF/sun-web.xml b/KAA-JSP/build/web/WEB-INF/sun-web.xml
deleted file mode 100644
index 1ac7af4..0000000
--- a/KAA-JSP/build/web/WEB-INF/sun-web.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD GlassFish Application Server 3.0 Servlet 3.0//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_3_0-0.dtd">
-<sun-web-app error-url="">
-  <class-loader delegate="true"/>
-  <jsp-config>
-    <property name="keepgenerated" value="true">
-      <description>Keep a copy of the generated servlet class' java code.</description>
-    </property>
-  </jsp-config>
-</sun-web-app>
-
diff --git a/KAA-JSP/build/web/catalog.jsp b/KAA-JSP/build/web/catalog.jsp
index fe89253..de004ad 100644
--- a/KAA-JSP/build/web/catalog.jsp
+++ b/KAA-JSP/build/web/catalog.jsp
@@ -174,6 +174,7 @@
                 if (status.equals("OK")){
                         String user = (String)responseJSON.get("user_name");
                         out.println("Hello, " + user);
+                        //out.println("<script>setUser('"+user+"');</script>");
                 }
                 else{
                         response.sendRedirect("http://localhost:8080/KAA-JSP/catalog."
@@ -220,6 +221,7 @@
                 });*/
         %>
         </span>
+
         </br>
             <a href="
             <%
@@ -397,6 +399,7 @@
             }
         %>
 
+        {{user}}
         <br>
         <div class="popup-box chat-popup" id="1" ng-show="isReceiverSet()" style="right: 0px; display: block;">
             <div class="popup-head">
@@ -407,8 +410,7 @@
             <div class="popup-messages">Tes</div>
             <div class="popup-input">
                 <input type="text" style="height: 100%" name="chat" class="auto-style1" hidefocus="hidefocus" />
-            </div>
-            
+            </div>          
         </div>
             
 <!--        <div ng-app="chatApp" ng-controller="chatController">
diff --git a/KAA-JSP/build/web/login.jsp b/KAA-JSP/build/web/login.jsp
index 1608f21..2db4b93 100644
--- a/KAA-JSP/build/web/login.jsp
+++ b/KAA-JSP/build/web/login.jsp
@@ -66,6 +66,7 @@
                 <div class="input_field">
                     Password<br><input type="password" name="password"><br>
                 </div>
+                <input type="hidden" name="chattoken" id="chattoken" value="getChatToken()">
                 <div class="submit_button_add">
                     <input type="submit" name ="submit" value="LOGIN">
                 </div>
@@ -134,5 +135,44 @@
             json2.put("data",json1);
             System.out.println(json2.toString());
         %>
+        <!-- Firebase -->
+        <script src="https://www.gstatic.com/firebasejs/3.6.1/firebase.js"></script>
+        <script>
+            var config = {
+                apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU",
+                authDomain: "tugas-besar-wbd.firebaseapp.com",
+                databaseURL: "https://tugas-besar-wbd.firebaseio.com",
+                storageBucket: "tugas-besar-wbd.appspot.com",
+                messagingSenderId: "1049009619420"
+            };
+            firebase.initializeApp(config);
+
+            messaging = firebase.messaging();
+
+            messaging.requestPermission()
+              .then(function() {
+                console.log('Notification permission granted.');
+                return messaging.getToken();
+                // TODO(developer): Retrieve an Instance ID token for use with FCM.
+                // ...
+                
+              })
+              .then(function(token){
+                  console.log(token);
+              })
+              .catch(function(err) {
+                console.log('Unable to get permission to notify.', err);
+              });
+            
+              var chattoken= messaging.getToken();
+              
+                console.log(chattoken);
+              
+              var getChatToken=function(){
+                  return chattoken;
+              };
+              
+              document.getElementById("chattoken").value = chattoken;
+        </script>
     </body>
 </html>
diff --git a/KAA-JSP/dist/KAA-JSP.war b/KAA-JSP/dist/KAA-JSP.war
index 7dde69db16939876c78a7f9ab52916a22b9eaa55..da3a21aee0d46caaf34457873a7ed4e9b7f8791c 100644
GIT binary patch
delta 4932
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
C{RhDS

delta 2763
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
JV`_j-{|6aifRO+I

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 0f61037..17b05e1 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=/home/khrs/.netbeans/8.2/config/GlassFishEE6/Properties/gfv3-2049786751.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
-user.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
+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
+user.properties.file=/home/khrs/.netbeans/8.2/build.properties
diff --git a/KAA-JSP/nbproject/private/private.xml b/KAA-JSP/nbproject/private/private.xml
index 76c5a8e..6da6550 100644
--- a/KAA-JSP/nbproject/private/private.xml
+++ b/KAA-JSP/nbproject/private/private.xml
@@ -3,12 +3,11 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/D:/Kuliah/IF%20ITB/Semester%205/Web%20Based%20Development/TugasBesar3_AngularJSandFirebase/KAA-JSP/web/catalog.jsp</file>
-            <file>file:/D:/Kuliah/IF%20ITB/Semester%205/Web%20Based%20Development/TugasBesar3_AngularJSandFirebase/KAA-JSP/web/login.jsp</file>
-            <file>file:/D:/Kuliah/IF%20ITB/Semester%205/Web%20Based%20Development/TugasBesar3_AngularJSandFirebase/KAA-JSP/src/java/org/saleproject/KAA/tokenParser.java</file>
-            <file>file:/D:/Kuliah/IF%20ITB/Semester%205/Web%20Based%20Development/TugasBesar3_AngularJSandFirebase/KAA-JSP/src/java/org/saleproject/KAA/DB.java</file>
-            <file>file:/D:/Kuliah/IF%20ITB/Semester%205/Web%20Based%20Development/TugasBesar3_AngularJSandFirebase/KAA-JSP/src/java/org/saleproject/KAA/RestAPI_consumer.java</file>
-            <file>file:/D:/Kuliah/IF%20ITB/Semester%205/Web%20Based%20Development/TugasBesar3_AngularJSandFirebase/KAA-JSP/web/scripts/app.js</file>
+            <file>file:/home/khrs/GitProject/WBD/Tubes3/TugasBesar3_AngularJSandFirebase/KAA-JSP/web/css/style.css</file>
+            <file>file:/home/khrs/GitProject/WBD/Tubes3/TugasBesar3_AngularJSandFirebase/KAA-JSP/web/catalog.jsp</file>
+            <file>file:/home/khrs/GitProject/WBD/Tubes3/TugasBesar3_AngularJSandFirebase/KAA-JSP/web/scripts/app.js</file>
+            <file>file:/home/khrs/GitProject/WBD/Tubes3/TugasBesar3_AngularJSandFirebase/KAA-JSP/src/java/org/saleproject/KAA/UploadProduct.java</file>
+            <file>file:/home/khrs/GitProject/WBD/Tubes3/TugasBesar3_AngularJSandFirebase/KAA-JSP/src/java/NewServlet.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/KAA-JSP/nbproject/project.properties b/KAA-JSP/nbproject/project.properties
index 9ad84af..c2d6fb2 100644
--- a/KAA-JSP/nbproject/project.properties
+++ b/KAA-JSP/nbproject/project.properties
@@ -34,7 +34,7 @@ j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
 j2ee.deploy.on.save=true
 j2ee.platform=1.7-web
-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.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 fe89253..de004ad 100644
--- a/KAA-JSP/web/catalog.jsp
+++ b/KAA-JSP/web/catalog.jsp
@@ -174,6 +174,7 @@
                 if (status.equals("OK")){
                         String user = (String)responseJSON.get("user_name");
                         out.println("Hello, " + user);
+                        //out.println("<script>setUser('"+user+"');</script>");
                 }
                 else{
                         response.sendRedirect("http://localhost:8080/KAA-JSP/catalog."
@@ -220,6 +221,7 @@
                 });*/
         %>
         </span>
+
         </br>
             <a href="
             <%
@@ -397,6 +399,7 @@
             }
         %>
 
+        {{user}}
         <br>
         <div class="popup-box chat-popup" id="1" ng-show="isReceiverSet()" style="right: 0px; display: block;">
             <div class="popup-head">
@@ -407,8 +410,7 @@
             <div class="popup-messages">Tes</div>
             <div class="popup-input">
                 <input type="text" style="height: 100%" name="chat" class="auto-style1" hidefocus="hidefocus" />
-            </div>
-            
+            </div>          
         </div>
             
 <!--        <div ng-app="chatApp" ng-controller="chatController">
diff --git a/KAA-JSP/web/login.jsp b/KAA-JSP/web/login.jsp
index 1608f21..2db4b93 100644
--- a/KAA-JSP/web/login.jsp
+++ b/KAA-JSP/web/login.jsp
@@ -66,6 +66,7 @@
                 <div class="input_field">
                     Password<br><input type="password" name="password"><br>
                 </div>
+                <input type="hidden" name="chattoken" id="chattoken" value="getChatToken()">
                 <div class="submit_button_add">
                     <input type="submit" name ="submit" value="LOGIN">
                 </div>
@@ -134,5 +135,44 @@
             json2.put("data",json1);
             System.out.println(json2.toString());
         %>
+        <!-- Firebase -->
+        <script src="https://www.gstatic.com/firebasejs/3.6.1/firebase.js"></script>
+        <script>
+            var config = {
+                apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU",
+                authDomain: "tugas-besar-wbd.firebaseapp.com",
+                databaseURL: "https://tugas-besar-wbd.firebaseio.com",
+                storageBucket: "tugas-besar-wbd.appspot.com",
+                messagingSenderId: "1049009619420"
+            };
+            firebase.initializeApp(config);
+
+            messaging = firebase.messaging();
+
+            messaging.requestPermission()
+              .then(function() {
+                console.log('Notification permission granted.');
+                return messaging.getToken();
+                // TODO(developer): Retrieve an Instance ID token for use with FCM.
+                // ...
+                
+              })
+              .then(function(token){
+                  console.log(token);
+              })
+              .catch(function(err) {
+                console.log('Unable to get permission to notify.', err);
+              });
+            
+              var chattoken= messaging.getToken();
+              
+                console.log(chattoken);
+              
+              var getChatToken=function(){
+                  return chattoken;
+              };
+              
+              document.getElementById("chattoken").value = chattoken;
+        </script>
     </body>
 </html>
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 b45e5d5e0a07b9fa16925044c1a3c44093b4f789..e8bacc4e46587a9912d84eb96a9f827573449254 100644
GIT binary patch
delta 1389
zcmd^;NlX+$6o$W^?KMS<IASsp3^9m$7=uO=FQPK;#)A>XL2((k5rhG826u1;#hnHb
z7d#nFJSjIZdN=WA)C&n$FP^+Pf>nbv7fHMtO*;R3U4PZ<&R6e^gx`ic-i^I_11#aO
zB1}}MRd|Tn>@abskvf}Q!fu7l9wU2&n6OXSuQ<R##UbK(9H!o64Z;zjQISuRVmb*$
zkY*z-!cj$tsF7CTn2@w9NhykH6OP*~P?T~ak2#zaP6?-N&X~WdGfQV}+D+`RIcMT|
z;lhj8AuB)7oJzK&k{0texefku_q+AfeeM}_<K6-LB9|O4)9Kp2NTAE%3Rm6DzNX@C
zhih~S*Bx$fQ@G`Dn>!9YxbA1)(qJ!r4vV>Kq~GD5t}xp_*E_&{ccZ_i_yG?s3L9c=
zv5Ll6B3@CQY^_hk9Ud__H0<y7*Y+@t<t#*aqO)aGYHS}f*$Nazd}F0{E#@;ymCigY
z;u8^8;ni31fz_<RM-4Ao%R2mY)6RM}5OAO6S9O#M6OSz#vn4peab^<8E^E^`qM>KZ
zw0ZTUnV~m~>u<^L8?~P;Gz&GkFN8$jm8Hv<1k;pcs(H<^Qiup;h2*h?>Y?{j3oW;Q
z%Ge(<{K#SWlEW~X!!VM=Fr35C^$Ww-g1-er`J@=OW-t_Z{$m8&vYk*?^pAH!*~CCh
N)(Ms#V)Sfn{|VTj#R>ob

delta 1432
zcmd^<T~JL?6vuz(+-~dK(~(N0Db*Ovc(^8pN1=Q+V}>ar-?u0wmE0m9<va2fyAVQ%
zJQ;e!@b1BwVR&lv%CpCmy>D~xOL;fUoLOtlUVH!7I={2_c^4cCw!I&H^%hvfGnXLc
zLWPS>xx;Sb_ZU;@P$lejai}(?M%X9R3j1B^sCQ}LK!8RLnkXzZ3C%7E9CDe)VV4wI
zj5#74b;+RIm}A0mq1DN!%_WNy!byjDF1efvFq_lD8R4wMIn!08S!#DUZ~O&^4&yHh
zmtMTdu+)(CA-=vT+|U$O19o4IR?^KzThzT&=(^+8w5Tfb^*EQg;&GKu^}|;fxaM&k
zWs#}Y+L>xy-1?j@k8V1J8y+{gCG>dQ=8nf*dM(mbgPpEE#pR^k<G#m29vIW-@sLi7
znd+N0U1j?{-y<HYpuaS$pC=YcHKFEEUTvtZDz7BmSY21;@sxqVUVoRrte<2Sldrjc
zi9}0qN#!R?nUBR>hFPW~n+1HOfI@uwTYY9ZD~O|%m#kzJemZDnHEW31FOy7>J|U_j
zp`fi;7=KEH4Oqg)lrb`ik1p$^$%vMUBu8+BO(Ue~4P&~hOx&pRQK4+y$@9Wyp$scm
z*pf2BjEI`g94m%GVQUfrwy}Ni`P3v!wM-fP1BPEQ4BulIhGQ6pVi;b>Ftks=@G<dk
n!7yi13_Bti67ByO!OrL;_*4J!NtiW$Atsvyi(UFhY!mto#cT3+

diff --git a/MarketPlaceService/dist/MarketPlaceService.war b/MarketPlaceService/dist/MarketPlaceService.war
index eab95ace303cfd00707694ceea4941fdd43e01e8..3669d98d5ed79bfdbf33696864a262a4332b7a5d 100644
GIT binary patch
delta 632
zcmdnDjd{^FW}X0VW)?061`Y-Wrd<<xG&vY|)p|~Gp6f8tHj~ZJP&diYWa1iSCdOS8
zFRFmZ?>azovMQqihze&k0a3k-?jY(Kqd$mJXVL&tn**87vw~<PjzdNu`k9p#Gnj8z
z!v>-kxXk7T(Y67;93Z+UqLc+hGso^01JMVHzs2x^9P{?=@3tOB28N!=hcDPLa!qEs
zXfoOSqQ&Hbi@AbaoC;;BMa7x<dA3T%dWK4NlRsP()#Oru0-NI0VvwY6NoH<perbsv
zTn41T*kH2ZC232rn2kP6X>xvET4uT(myLdTYLaeZL4h3?B8WilS?15fxDV)_eUm#b
zDX?<cDC+7?UVq7V^50A5lT9zHigD@c0(EDU<mN!Ev&l$JOtG6>a#?%wg3I!g4_x*a
zhgu1ifUuMDQ!4EyYhF=PhRT5jfR2Ee6X4CrB*F}frpcvOEaCAqdD|5$V0cabbOjt2
z8dq&VytJzhAZo=`7ZCOCYB-2;zZMS`yk-HS9$hN}QDN81LDc!{B_PW6Mh=MDd?Ob`
yDcvjuQ8RC*gD9q3c_6CjmM>booVjHnj}kJ#&;hy?4wf{gPL{qc%jSIrBm@8=RM1fX

delta 682
zcmZ3qjd|ZTW}X0VW)?061`Y-W^{o?mG&$6^)_Nvi*g0*YZ6=$6p>C3)@x(RCOln&v
zUQ}TMs`#!0Bqysf8i1&9MiUU#%jgcGt}*%p)lF7s(g5-{2Qr;!1<^_zhm1h<Gb<}*
zFyF3*4MZ<+navHNZ3BEcKy*(;DGP{Zj@>N=G-mUG;%_m$AjkL^@?D(4$iOgT^5F|M
z%)DH@lP;Pt@=i9nXaOX1F6L_Ta&an@r4|)u=I7Ze8S5D;+3|8I0D(<$YB5MqH#t8q
zEi>JYck=&>QW+3AkUR(&8zA^L`Y;V8nYpR?r6n+P;NmcYxNP*xQ<HQP3krZr5CI5s
z?ep!8j^}``JvX`Lk^(y~myM#XF7M=pmwbVaeRs(mNUB~|mEz^n)dgy`$tcOqf!UIg
znwSD~W5Q)^prY=}@<4LcWq+VjkUMSkA<_^|QhrJ$P^rKbH8q$tL<s0GsF4BQj7%cT
zu!x-;dBqYQvy*3Cu>wWZwJYG*<GE@B4EM=iR~<l9&s7%?b?It2h|<0m4^r84%>u+b
zcC83RSzRv&QJb%qfGEuyIUs8Kja(4LcC!>j)!s}8QO|DXfwYI+@<ofu4Yv&BQ9=tC
WVnDaT!IH+p$^UQ3vZY@E2>}55ecWjP

diff --git a/MarketPlaceService/nbproject/ant-deploy.xml b/MarketPlaceService/nbproject/ant-deploy.xml
index 2d5f877..5d33e0d 100644
--- a/MarketPlaceService/nbproject/ant-deploy.xml
+++ b/MarketPlaceService/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/MarketPlaceService/nbproject/private/private.properties b/MarketPlaceService/nbproject/private/private.properties
index 0f61037..17b05e1 100644
--- a/MarketPlaceService/nbproject/private/private.properties
+++ b/MarketPlaceService/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=/home/khrs/.netbeans/8.2/config/GlassFishEE6/Properties/gfv3-2049786751.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
-user.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
+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
+user.properties.file=/home/khrs/.netbeans/8.2/build.properties
diff --git a/MarketPlaceService/nbproject/project.properties b/MarketPlaceService/nbproject/project.properties
index d31fdb7..ea23c61 100644
--- a/MarketPlaceService/nbproject/project.properties
+++ b/MarketPlaceService/nbproject/project.properties
@@ -34,7 +34,7 @@ j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
 j2ee.deploy.on.save=true
 j2ee.platform=1.7-web
-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.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