From 6dd6308825d01967bbe0e9bf4fae256c39306542 Mon Sep 17 00:00:00 2001
From: DELL <DELL>
Date: Wed, 30 Nov 2016 11:39:01 +0700
Subject: [PATCH] fix ajax message, fix some bug
---
IdentityService/.DS_Store | Bin 0 -> 6148 bytes
IdentityService/.classpath | 17 ++--
IdentityService/.gitignore | 1 +
.../.settings/org.eclipse.jdt.core.prefs | 6 +-
....eclipse.wst.common.project.facet.core.xml | 4 +-
IdentityService/WebContent/.DS_Store | Bin 0 -> 6148 bytes
IdentityService/WebContent/WEB-INF/.DS_Store | Bin 0 -> 6148 bytes
.../build/classes/com/KEM/ws/DataUser.class | Bin 3480 -> 3480 bytes
.../build/classes/com/KEM/ws/IdentityS.class | Bin 4264 -> 4264 bytes
.../classes/com/KEM/ws/ValidateToken.class | Bin 5054 -> 5054 bytes
.../classes/com/KEM/ws/generateToken.class | Bin 1008 -> 1008 bytes
.../classes/com/KEM/ws/getTokenFCM.class | Bin 3859 -> 3859 bytes
.../build/classes/com/KEM/ws/logout_IS.class | Bin 3670 -> 3670 bytes
.../classes/com/KEM/ws/registerUser.class | Bin 5135 -> 5135 bytes
.../build/classes/com/KEM/ws/tokenFCM.class | Bin 3887 -> 3887 bytes
IdentityService/src/.DS_Store | Bin 0 -> 6148 bytes
IdentityService/src/com/.DS_Store | Bin 0 -> 6148 bytes
IdentityService/src/com/KEM/.DS_Store | Bin 0 -> 6148 bytes
IdentityService/src/com/KEM/ws/.DS_Store | Bin 0 -> 6148 bytes
JAR/.DS_Store | Bin 0 -> 8196 bytes
JAR/commons-fileupload-1.3.2-bin/.DS_Store | Bin 0 -> 6148 bytes
JAR/json-simple-1.1.1.jar | Bin 0 -> 23737 bytes
JAR/json-simple-1.1.jar | Bin 16046 -> 0 bytes
JAR/mysql-connector-java-5.0.8/.DS_Store | Bin 0 -> 6148 bytes
KEMProject/.DS_Store | Bin 0 -> 10244 bytes
KEMProject/.classpath | 20 ++--
KEMProject/.gitignore | 1 +
KEMProject/.project | 2 +-
KEMProject/.settings/.jsdtscope | 7 +-
.../org.eclipse.core.resources.prefs | 9 ++
.../.settings/org.eclipse.jdt.core.prefs | 6 +-
....eclipse.wst.common.project.facet.core.xml | 4 +-
...rg.eclipse.wst.jsdt.ui.superType.container | 2 +-
.../org.eclipse.wst.jsdt.ui.superType.name | 2 +-
KEMProject/WebContent/.DS_Store | Bin 0 -> 6148 bytes
KEMProject/WebContent/catalog.jsp | 90 ++++++++++--------
.../backend/javaclass/Confirmation.class | Bin 2615 -> 2615 bytes
.../backend/javaclass/IOException.class | Bin 3554 -> 3554 bytes
.../classes/backend/javaclass/Login.class | Bin 4508 -> 4571 bytes
.../backend/javaclass/Marketplace.class | Bin 1798 -> 1798 bytes
.../MarketplaceImplPortBindingStub.class | Bin 22599 -> 22599 bytes
.../javaclass/MarketplaceImplService.class | Bin 431 -> 431 bytes
.../MarketplaceImplServiceLocator.class | Bin 4697 -> 4697 bytes
.../backend/javaclass/MarketplaceProxy.class | Bin 5533 -> 5533 bytes
.../backend/javaclass/OrderDetails.class | Bin 16003 -> 16003 bytes
.../classes/backend/javaclass/Products.class | Bin 9597 -> 9597 bytes
.../classes/backend/javaclass/User.class | Bin 9115 -> 9115 bytes
.../backend/javaclass/addProduct.class | Bin 5440 -> 5440 bytes
.../classes/backend/javaclass/delete.class | Bin 1971 -> 1971 bytes
.../backend/javaclass/editProduct.class | Bin 3320 -> 3320 bytes
.../classes/backend/javaclass/likes.class | Bin 2156 -> 2039 bytes
.../classes/backend/javaclass/logout.class | Bin 3840 -> 3840 bytes
.../classes/backend/javaclass/register.class | Bin 4733 -> 4793 bytes
.../classes/backend/javaclass/search.class | Bin 1260 -> 1260 bytes
.../backend/javaclass/sendMessage.class | Bin 4815 -> 4815 bytes
.../classes/backend/javaclass/urlWSDL.class | Bin 581 -> 581 bytes
.../backend/javaclass/validateToken.class | Bin 3869 -> 3869 bytes
KEMProject/src/backend/javaclass/Login.java | 4 +-
KEMProject/src/backend/javaclass/likes.java | 2 +-
.../src/backend/javaclass/register.java | 4 +-
Marketplace/.DS_Store | Bin 0 -> 6148 bytes
Marketplace/.classpath | 14 +--
Marketplace/.gitignore | 1 +
.../.settings/org.eclipse.jdt.core.prefs | 6 +-
....eclipse.wst.common.project.facet.core.xml | 4 +-
.../endpoint/MarketplacePublisher.class | Bin 980 -> 980 bytes
.../backend/javaclass/Marketplace.class | Bin 2070 -> 2070 bytes
.../backend/javaclass/MarketplaceImpl.class | Bin 30096 -> 30046 bytes
.../backend/javaclass/OrderDetails.class | Bin 4643 -> 4643 bytes
.../classes/backend/javaclass/Products.class | Bin 2504 -> 2504 bytes
.../classes/backend/javaclass/User.class | Bin 2313 -> 2313 bytes
.../classes/backend/javaclass/urlWSDL.class | Bin 581 -> 581 bytes
Marketplace/src/.DS_Store | Bin 0 -> 6148 bytes
Marketplace/src/backend/.DS_Store | Bin 0 -> 6148 bytes
.../backend/javaclass/MarketplaceImpl.java | 2 +-
SW/.DS_Store | Bin 0 -> 6148 bytes
{a => SW}/.classpath | 2 +-
{a => SW}/.project | 2 +-
{a => SW}/.settings/.jsdtscope | 0
.../.settings/org.eclipse.jdt.core.prefs | 0
.../org.eclipse.wst.common.component | 4 +-
....eclipse.wst.common.project.facet.core.xml | 0
...rg.eclipse.wst.jsdt.ui.superType.container | 0
.../org.eclipse.wst.jsdt.ui.superType.name | 0
{a => SW}/WebContent/META-INF/MANIFEST.MF | 0
{a => SW}/WebContent/firebase-messaging-sw.js | 0
a/WebContent/WEB-INF/web.xml | 12 ---
chatService/.DS_Store | Bin 0 -> 6148 bytes
chatService/.classpath | 30 +++++-
....eclipse.wst.common.project.facet.core.xml | 4 +-
.../build/classes/javachat/connectFB.class | Bin 3030 -> 3090 bytes
.../build/classes/javachat/sendMessage.class | Bin 7412 -> 7432 bytes
chatService/src/javachat/connectFB.java | 3 +-
chatService/src/javachat/sendMessage.java | 2 +-
94 files changed, 148 insertions(+), 119 deletions(-)
create mode 100644 IdentityService/.DS_Store
create mode 100644 IdentityService/.gitignore
create mode 100644 IdentityService/WebContent/.DS_Store
create mode 100644 IdentityService/WebContent/WEB-INF/.DS_Store
create mode 100644 IdentityService/src/.DS_Store
create mode 100644 IdentityService/src/com/.DS_Store
create mode 100644 IdentityService/src/com/KEM/.DS_Store
create mode 100644 IdentityService/src/com/KEM/ws/.DS_Store
create mode 100644 JAR/.DS_Store
create mode 100644 JAR/commons-fileupload-1.3.2-bin/.DS_Store
create mode 100644 JAR/json-simple-1.1.1.jar
delete mode 100644 JAR/json-simple-1.1.jar
create mode 100644 JAR/mysql-connector-java-5.0.8/.DS_Store
create mode 100644 KEMProject/.DS_Store
create mode 100644 KEMProject/.gitignore
create mode 100644 KEMProject/.settings/org.eclipse.core.resources.prefs
create mode 100644 KEMProject/WebContent/.DS_Store
create mode 100644 Marketplace/.DS_Store
create mode 100644 Marketplace/.gitignore
create mode 100644 Marketplace/src/.DS_Store
create mode 100644 Marketplace/src/backend/.DS_Store
create mode 100644 SW/.DS_Store
rename {a => SW}/.classpath (89%)
rename {a => SW}/.project (98%)
rename {a => SW}/.settings/.jsdtscope (100%)
rename {a => SW}/.settings/org.eclipse.jdt.core.prefs (100%)
rename {a => SW}/.settings/org.eclipse.wst.common.component (77%)
rename {a => SW}/.settings/org.eclipse.wst.common.project.facet.core.xml (100%)
rename {a => SW}/.settings/org.eclipse.wst.jsdt.ui.superType.container (100%)
rename {a => SW}/.settings/org.eclipse.wst.jsdt.ui.superType.name (100%)
rename {a => SW}/WebContent/META-INF/MANIFEST.MF (100%)
rename {a => SW}/WebContent/firebase-messaging-sw.js (100%)
delete mode 100644 a/WebContent/WEB-INF/web.xml
create mode 100644 chatService/.DS_Store
diff --git a/IdentityService/.DS_Store b/IdentityService/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3efd2c06b3afae4d1a42b80ecc5d5d9886ab3ab2
GIT binary patch
literal 6148
zcmeHK&2G~`5T0!Uxaq|Rs#fB%SEL*gwNQ>GZI6{A88t!_1shvrCCeMxPNOP{<TDrE
zfws`+sLDg|CLEdBouZbMD@16=n)zmTXV&&7?au&!=uMI?fDZs3Dq*vQ<_@88(gj)J
zo+hH8Im&UI=@?r-;_*VX>u?M>29}KhTDuJ>p@8@C^yd1_R9SU8-^EI!dGG!MZ?&~X
zkN>dsHXP|`SVh&O>_x>J(^5$qv)_-Z(Y60d>+F{w#fK`L4*kcwI<F#?r^Subqk+m3
zJ?-g9o|H$Soo}F$YBcoM`$c+;sr@KV4^^pRm8t5)Tcu~{Z_H-h7j3z<-JQ4PY-gv_
zmfKs;=X3v)=RJA)?B&7h@%-cG)3ft0UoS4NEd2s^D<h8>ui+ay%*Jt8<eAPtU=KyN
zU;rt^unQV;sL)627z1MLPHukV55t@+83ViuytO6!F84W(0ms0<XMpwxiAoqS))vjy
zfyR^oh;)rGf<Dy}lp`4f#@Zr|pa`3aXj2837{aDwzvQ@pv9@T_L2&UQ_|1YV6k*<u
z^Gg#BBCzPJW56+Rn}LRH`gH#9|GECZo#a}M0ms09#eit;g?l~xB|cjhevZysiTVze
pgyL$8CIt;2$Ht+fcoWqKj!AM51IF4S_Mo_nfT6(|$G~4@;3qdtypaF^
literal 0
HcmV?d00001
diff --git a/IdentityService/.classpath b/IdentityService/.classpath
index e1de908..f486b55 100644
--- a/IdentityService/.classpath
+++ b/IdentityService/.classpath
@@ -1,39 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/commons-fileupload-1.3.2-bin/lib/commons-fileupload-1.3.2.jar">
+ <classpathentry exported="true" kind="lib" path="/Users/wahyudinakbar/Downloads/servlet-3_0-final-jar_and_schema/javax.servlet.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/commons-io-2.5/commons-io-2.5.jar">
+ <classpathentry exported="true" kind="lib" path="/Users/wahyudinakbar/Downloads/javax.jws-3.1.2.2.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/mysql-connector-java-5.0.8/mysql-connector-java-5.0.8-bin.jar">
+ <classpathentry exported="true" kind="lib" path="/Users/wahyudinakbar/Downloads/javax.ws.rs-api-2.0.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/javax.jws-3.1.2.2.jar">
+ <classpathentry exported="true" kind="lib" path="/Users/wahyudinakbar/Downloads/mysql-connector-java-5.0.8/mysql-connector-java-5.0.8-bin.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/javax.servlet-api-3.0.1.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/javax.ws.rs-api-2.0.jar">
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/CLEAN/JAR/json-simple-1.1.1.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
diff --git a/IdentityService/.gitignore b/IdentityService/.gitignore
new file mode 100644
index 0000000..84c048a
--- /dev/null
+++ b/IdentityService/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/IdentityService/.settings/org.eclipse.jdt.core.prefs b/IdentityService/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/IdentityService/.settings/org.eclipse.jdt.core.prefs
+++ b/IdentityService/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/IdentityService/.settings/org.eclipse.wst.common.project.facet.core.xml b/IdentityService/.settings/org.eclipse.wst.common.project.facet.core.xml
index c6144e8..afd81bd 100644
--- a/IdentityService/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/IdentityService/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <fixed facet="java"/>
+ <fixed facet="jst.web"/>
<fixed facet="wst.jsdt.web"/>
- <installed facet="java" version="1.7"/>
+ <installed facet="java" version="1.8"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>
diff --git a/IdentityService/WebContent/.DS_Store b/IdentityService/WebContent/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..7ae33ef6548e70cdcc278dceed9b7ca2a018b0b2
GIT binary patch
literal 6148
zcmeHK&1%~~5T141Moum&ZD}EwJvQKiP0}VuMNI-ZBp4K8LQ-6*67_=68cU8T#-MXA
zeTV*}eU8%H`T~8E-kh1;bx7jo7D`)o#OyaaJ2PTG+4}<k%pb%}02crpRKiLPo8JhH
zlg>!Rc&dm@)p!a!um{^aseC;XZ5@9j1N7}2*o7_FhYh&&{i0MxI7UB=ZPX_dC1?T6
zLmT7$8=`+uG%A}+DENAGG|YRZ_OGayio9qvezMA3_0HXSr?#+2k9%+7Wzdzwpa_dW
z?uY#&)e~_N8M_r0-Ko7VWqM(U(Sb;Y9rwWtnH8bPlK!RC<F?3RIrQZqi}T|^*K3Qo
z=yu$Pt$uQXsjV<e4n!^@k&5E2Q=_NjJ{pah>vg`e+8o#UXl<=g=c_Bv$7A=s<18&d
z+t@wqjo*Fv`04ZMm#^Qxt9b*%|AdnJ2B&a_#x)L4f_|3D><x}gv!>A&Ed!PT%fRh3
zU{)Gu@%BsGik1P(z(39atq&ZP&@)(SR7(do>I#5J$4Dh;(~*&KxIxcgsS!s|m`+91
zsmxq4m`+DOH*uc9Qlm}>W-cGhyqTFB3R7>#`dozr^EBGlGGH0F%D|lNy0rgq-F*MQ
znq+&H0n5OD#Q>{r2Ae)k$?UB&lcT+sqrO5Vp}11xMG6{fE5=ybiXWpYK|d!0(KA?T
SL=TER2q+qCV;T6P44ebeV|HEu
literal 0
HcmV?d00001
diff --git a/IdentityService/WebContent/WEB-INF/.DS_Store b/IdentityService/WebContent/WEB-INF/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c8bc6501f8df77b30bab949cf95fa0002c7410ba
GIT binary patch
literal 6148
zcmeHKyGjH>5UlnNJTSS?a6%)&KUj`aF!l#z)j(LeNX~FGf6jl>>WAXqYHA?W&|N#z
zU9)Tj+tUDS^L&2+tO2a(j(GJjH_yAz?5K7e&Cl4~^~0{`Dvq1g|Fq%U1qM8#zaA$1
zD`w8#!-9B>Js!~G94~mna8UhrP#qKnDIf);fE17dQedV4d$!x^BvDZcNC7GErGWn*
z8r`ug924W$!Qj_-&o3R__#BsiVyksmI3_Yfv!oJ}YBge5%?_4y=DVsN6O#^$H}jl&
zv(<!RHF{W!a#)wBC<UazRDne<*WUjx>A%eXQ<7FvKnnaT1#G#!*>3nr)mvvD=e@Sk
tZ|R@L+9+p;R!odm%!Rk&({FXnpPBCp$Hbs>Kj=hV1Y8%H6!;4TJ^<0JB@zGt
literal 0
HcmV?d00001
diff --git a/IdentityService/build/classes/com/KEM/ws/DataUser.class b/IdentityService/build/classes/com/KEM/ws/DataUser.class
index d0984e1c42d5c4a7d31426bae5773a0c18a86d23..c208235b717e1a46de19b6df1ab73472bb91211b 100644
GIT binary patch
delta 17
ZcmbOsJwuw~)W2Q(7#J8#HgZhh1pqz-1~~u#
delta 17
ZcmbOsJwuw~)W2Q(7#J9gH*!qi1pqz&1~>o!
diff --git a/IdentityService/build/classes/com/KEM/ws/IdentityS.class b/IdentityService/build/classes/com/KEM/ws/IdentityS.class
index fa096e5059f73f7d592628ad129cf8e0b5427b23..dc0c67096f20a438bc7dbc3fbc614dca72bf0945 100644
GIT binary patch
delta 17
ZcmZ3XxI&TR)W2Q(7#J8#HgYTw002PS26zAf
delta 17
ZcmZ3XxI&TR)W2Q(7#J9gH*zcx002PN26q4e
diff --git a/IdentityService/build/classes/com/KEM/ws/ValidateToken.class b/IdentityService/build/classes/com/KEM/ws/ValidateToken.class
index 53e456c442e69d130de5aa7c6f07a475b7a27448..b02bd29da8c48b8fdb402e9e3665aac7d70a3878 100644
GIT binary patch
delta 17
Zcmdm|zE7Rw)W2Q(7#J8#Hgaqe1^`5U2FU;b
delta 17
Zcmdm|zE7Rw)W2Q(7#J9gH*#zf1^`5P2FL&a
diff --git a/IdentityService/build/classes/com/KEM/ws/generateToken.class b/IdentityService/build/classes/com/KEM/ws/generateToken.class
index 41138cbebfbccd0e412f762848c7e1b07ab84b64..cc9c4c0bcc568a3a3cad7c6d904cce71327fd796 100644
GIT binary patch
delta 17
Zcmeys{(+t2)W2Q(7#J8#HgddR1^`D=2M+)M
delta 17
Zcmeys{(+t2)W2Q(7#J9gH*&mS1^`D*2Mz!L
diff --git a/IdentityService/build/classes/com/KEM/ws/getTokenFCM.class b/IdentityService/build/classes/com/KEM/ws/getTokenFCM.class
index 7e94ef498bc519099f261b79bfdf8ff74cd0003f..81c58543d55dbf27b9e513fa9431945ceed0ff7f 100644
GIT binary patch
delta 17
ZcmbO%H(8G3)W2Q(7#J8#Hga(D0{}d>1+oAD
delta 17
ZcmbO%H(8G3)W2Q(7#J9gH*#?E0{}d+1+f4C
diff --git a/IdentityService/build/classes/com/KEM/ws/logout_IS.class b/IdentityService/build/classes/com/KEM/ws/logout_IS.class
index 13c82a1de3a5ddddb3bc984148f3bfe9abd438dc..bdeecd21cc4f3badaccef8008f31bf37cac2b782 100644
GIT binary patch
delta 17
Zcmca6b4`Zh)W2Q(7#J8#Hgfp!0RTl`26g}d
delta 17
Zcmca6b4`Zh)W2Q(7#J9gH*)y#0RTl>26X@c
diff --git a/IdentityService/build/classes/com/KEM/ws/registerUser.class b/IdentityService/build/classes/com/KEM/ws/registerUser.class
index e734e3674c2a5adc8e1daf06e40619dd1db59f97..358e3b8f1e41bca8ed5569509a052b05e67e4193 100644
GIT binary patch
delta 17
YcmeCz=-1#l^>5cc1_lO`jU4PE06kv?zW@LL
delta 17
YcmeCz=-1#l^>5cc1_lP>jU4PE06kg-z5oCK
diff --git a/IdentityService/build/classes/com/KEM/ws/tokenFCM.class b/IdentityService/build/classes/com/KEM/ws/tokenFCM.class
index 5df84ebb9fb854e42a6c460c97521ef9e00f3573..383908b912998568bd951766713ed9d2295a7f78 100644
GIT binary patch
delta 17
ZcmZ24w_c9p)W2Q(7#J8#Hgc%*0{}p71_l5C
delta 17
ZcmZ24w_c9p)W2Q(7#J9gH*%=+0{}p21_b~B
diff --git a/IdentityService/src/.DS_Store b/IdentityService/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f7ba003f79c8d8546b4f430ba3bfa03e41a2fed0
GIT binary patch
literal 6148
zcmeHK%}(1u5Z+DF)`5$wwki@AAE}f>B52|0rhvo&DUuPWDphJ@t69nQMzKRwMUi~&
zg?DKAdk#b&qHn?tW_Bm2h;pU0nz3fT@$Agn`>nO>5kkoJFm4Iq3LzXZ5SKM3}t
z-jWJ=s(=#5(0fs;Be=uiSpEeDaP6vMPiXOFBfYVH>(H|RDlae1L?|j6<$YS^i>RNf
zyl6Im$x5~M=<yS$J~NA#`*h}G(9@%!2#aCf4hJ91or;r)>`qwpruLTB>9rk3+bS7#
z-RJLgR)i``2EV25?x-x*qqZJqalRYa@pe>P^t$eg&LG)`)J~Ws+bUO)N>%aIspHjk
zUyjGEm4>&t)S5KB@$z!B;Vmt`nM~XR$C-ci`t9cX{^Z;DABRWBC#PrUX1+qgH*Mq@
z;S_#?L2T>?gDlnAXYfp;r%{Z|05iZ0JX{87$8u&L?kn<}F$2uNUt$3F2M-j{CoC<R
ztpgfU0sz*)Z3Jxd^AG5u1JEZdErJI`+EhTBDyhVfR69tU4*fpGmlkchkmkuS4n0{?
zg(9i+ke&$_(znPhGr$boWB_YF5Esw?wY%$o6T}TOzzqDK49MDQu-b;X(b;-ymUz~B
tpr1fdFs`(CodSkAiXj${;yF+w;P=n~^a)Fg-~r(u0Yd{f%)q@ea0RewXXpR`
literal 0
HcmV?d00001
diff --git a/IdentityService/src/com/.DS_Store b/IdentityService/src/com/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..516bd2033c76ab53fe8eb26fe5873c4a99fdcaf9
GIT binary patch
literal 6148
zcmeHK&1%~~5Z<+&R!%MoZD^qv9b53hCVxFDZc->AU{FaYO>m@0#0x@eEIFnagU-G5
z9onSnbCmWW`X;$0GrQx^kmQ=CVMfe;quH62_FJ*55kkoJFm4Iq3LzXZ5S8wC4N
zuStbGRX~Yj=z}QL5!~T$EdK)oxOP>sDK^B`yY$NXy@j5apz{3OOoXDMQQoIjK8yOP
z%8O?6kE~Q{GmjoS_1QVR-1*tPpr=Pc5f;O|9S%O4I~6Ap*`2WHP3`wur<ZmZZL4I|
zb)UY`SrMu%8T^&HyQ8vLkJ@^e#rbYv$J<eH(d)Vkok4O0shu!OwpFeom8#;CQ^%|8
zJ{yl)uN&UtQft!i#;dE%hPSl1GMTtv9OuQW<+ZI3{mJLA-;PhdpZ@sy%gk3u_@<3K
zA)LZ*Fo=z#V34IcI|R=(dK$&Z3@`)C!2M-_b}VP^{=Oo=88g5P{38Z%fAByNeZtbB
z**c&xB>-Rz+(y7QKmULpIskpb(js_3q)i31sgg<zNwtHt>Co>}d}-093u&GV<Is~O
zRVb2559yh3A$^P7G6T%ORR*y3199>E-?+X0H$mJm1I)m~WI)!|gY`Ddjn39<v&6I3
t1KkHj!MM`mWeOPPD27-(il2iT0l$X^pifv@1P=)R2pAf;VFvD$feQfNX2Jjf
literal 0
HcmV?d00001
diff --git a/IdentityService/src/com/KEM/.DS_Store b/IdentityService/src/com/KEM/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ab3956d1c4b3abaa9d3437154d85896c3b217b3c
GIT binary patch
literal 6148
zcmeHK&2G~`5Z+A#IPJv<P%ClSW07)5)IvGBp{>*dQY52R6-B|u7Fo&iMzK??iX!>U
zrSDLF%5xxi2;PKSnc1CGK;c?NXvUiT#<MeP@3+>jM+hN%lcXzzFNE+w5gRRN{vz0q
zdQBSSSpt+eMx2=#Y#eNl`WP0Q0bIL=s6?@!nKyr|-#YZk%S$@}8xvQ>h+=-kqf8fN
zr}JGlmYTP2-|<?@D|q>LmtTcLQ-x(zPKsVMerfM?lE!5BqjEU6Ul@~J*-?C;(`w+~
ze`fMB(s?@mCH44F=ZUF$W|Akxap=Z7)JZuU_z(Ky^aN7-QJx;?LdQDO<*C=gYv8X=
zr`@M*wXxZqwbgWMtJ7AS8&764|IG6qK6<?U{Ae_LcmDpv$4?iZzkGGeCE<Iva*uEh
z-@ve3oP^^%Gx=M%pU2K)7?}ZPfEieH258^%Ru=t5`TdvyX5hvd!2LmiA_j!DL%VfA
zV@m+QCb+GDjlchxqX+}S+9C9SNS6xeQYDob(xro6QCvV+J9OznQt=__$&xA*X`c?`
zD;q9k;E-EpfEoCm0j&K%d_4bm|6TvvAa0leX5jy1KsI;6ogU1M&em(Q#Isg`z6M3X
oxZ2@W3K;e%hFCm`*Fdd+U!egQ5Y`UC1HwN7mIiK^fg5GuCv}r%S^xk5
literal 0
HcmV?d00001
diff --git a/IdentityService/src/com/KEM/ws/.DS_Store b/IdentityService/src/com/KEM/ws/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..11e54e4e8fc63f71b6e5051e802c7413d869ce37
GIT binary patch
literal 6148
zcmeHK!AiqG5Pe&VR79zsJm%<0@DD<XLa$c6YHC8M1_QMfyyY|eC_liz(KoY8X_^#z
zDk3v5`!<t(lkD3ilLg=gi|i8U1L)BOI|po9Ozw*}tP>*pM5j6K@P-^ST;RDe+5&%3
z0a?2vBuFu*udZK;ccjCjd>R+!n4@HiT+`2g)Yt<~G2wc@>Y7W29JeU(qA}S6Z8^Ty
zavWobOc`@bnd1W^-9If{chle&eBOk<AoGElHgmt%xF_7FIk{8rS$Xr>R<r-C&HkP<
zESMov{kEO`Y7V}XnJHijm;yUjfHhmJcj(btQ@|831(piP_aUMS#sMpj`srY!M*w1%
zVKw&UM^QLYz&K##k#}g$Q;DAH!V$xHI^$6o7YD37dOBP<e7Nvr7fvWnpU(V|4u^|9
zT5AfJ0(AxU{AFM2|JCO6f1PAkrhqB%uM}|IWRwgzrBGWNlapE-(I4qzGOqHtq_Cr<
gm}8|BpV8GAkEBD416Cdxq1lgs%3zHtuu}zo0mD*l+5i9m
literal 0
HcmV?d00001
diff --git a/JAR/.DS_Store b/JAR/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..7bff701a81fd423ad845d2852fb8ada318d2a646
GIT binary patch
literal 8196
zcmeHMO>fgc5S?ucq%A^0P_?2Qd<3bf(k7vB3!xx!K&l98g(xa^V~8tb2is|=qDVP&
z;mU~v-@k*e6F&g{37p`~u2UsWQwfR$fn95MHtU^d`_1myvmqi;s#g|>W{4;SVV#~t
zwMXIeEPZ7p?l}rAU{B<eM<HeCE;)Upb%$m^GoTsJ3}^;41AhYpcxQ7-4S4UXv%1y{
zXa@dE1~@(#5Z1+5x0RNm1C>kxpvTZH3);v7q>T~lVyxRrOH*K~>_Nn)B2F=cGRJv?
zheH=*-BwzelThX);wy_dLlN@ouruUv5=EtTtr^e^^fSP@`)S%l=6)YXcmD2@O?9e~
zi(Zo|$m$npo^p^yv@K-#-c{G%v|Qf;1~0oSkTc(9LF)jxRwJy%xZkXr>x5A@`$de5
zjvYFDBsD%U$w&J5#O-p`Z<Hf5s)r>rxFvr%72As2D`r&fv~T#nyW2LcRmW~@q)%S*
zy~uPtJLoc9Uvs>Q-zfQYuM)1872cXtiK-jvsg=OqhUtpw*{e?ISdQyNJE?I#HqtZA
zW<H;tGZvR}tvRE)w1jp(cdpe+KTf4)&lWCTyIE^JdiMOq%U7@8y!#+2A`!<kI-!2=
z)*lZ-;C4CiT;IC~48}j!=U@j;&A^fKR7g1S6UKKtabMe^b<|>^07qqim!tM2DdCJM
z+QNF;hCBrQThx#{X1uO=eX&becudgi8gV`0n%N$t5bHGnF0b1N&NZ=i9cV_*LKuB7
z)Xxdj=^j+RyLsU9u3iU`?~f7pK$9`xNmmRwg{ZOv>j${6jGTrZ_6TjXB22*meH}J3
zRETlU_dYlAlsqtI*HryFJTYau*}Q<6n#(UFLdw(rkn;9DctRN%QaI%Nl0OnNSYAa}
zL(jmddV(3w|1S^T{~!A2)DNH;&<qS_K#VPymrFR``4&wM<y_l<+<|c6ac!lg2`ZV6
pL(6m=diM`Qv<(bpn_{fnN}~tm4{QYJ_y13RkLmZnoT~p+^#frW_6Gm}
literal 0
HcmV?d00001
diff --git a/JAR/commons-fileupload-1.3.2-bin/.DS_Store b/JAR/commons-fileupload-1.3.2-bin/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c29e84d24226cbb0cc8ffde75fa0b148777e0a04
GIT binary patch
literal 6148
zcmeHK%}T>S5Z-O8rh18}Ab81D@KCkdYpi+{3K2!D)Pw}P5R%fQEm8_Od+{Coe-F`j
z@KL-uv%8f_^(LY+6K22J*_qw!w_!KS7~|EBzsi`&7&AZ-b44gV5o|{tlbrS-a_l2%
zd1359?bU0IMU&$<GJtEBXCV{J^LnG}7m6e;m0ox*UznJjGK$kP_?WZPCr&f&IjNg=
zlB(N2mNnrAp0;al+8o;ZaU8zeu6H1UUc;Q<j-%8SQP3VqtsjcWk9*a)6ZuKqQT-hX
zKW#S5g<3o4LTb&8f&-BVPlO^pH;VW)%*B4cTrRCxYnAoEiq)@Fz%H+E4hH6>VJt0g
zZ0#Mj1{YV?H@A29506i34LE$RQsy)c;Ta4~N7rdbVH}--XBa(<A|wWg0b<~fGoZIM
zW9E;~gI=E)AO^ml0o)%fP()i}rciDjP~h()wigglz{a}-qNUN+m??x75Ux@IRVvq4
z46f3_Z|OK&W2R80GcHGle)Py(-%z+59sHIIXWUjuB{4t@d}JW6swSTQyI<e`KPFL)
z7$64z6$8Am<Lp#nO8RUan;f3C7U(G`3dUs$-&4SlM=`|WQM?E$1^gBofVRd=A$UOO
OM?lg*1u^iW47>rmD`NEk
literal 0
HcmV?d00001
diff --git a/JAR/json-simple-1.1.1.jar b/JAR/json-simple-1.1.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..66347a6c86b7d6442358ca7643e4dc484fb01866
GIT binary patch
literal 23737
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
A{Qv*}
literal 0
HcmV?d00001
diff --git a/JAR/json-simple-1.1.jar b/JAR/json-simple-1.1.jar
deleted file mode 100644
index f395f41471a796876278a6c5667ded4632546893..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 16046
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
a8L}0m!Qak)-yAaEKD=*TR-5bRum1-nT1oBz
diff --git a/JAR/mysql-connector-java-5.0.8/.DS_Store b/JAR/mysql-connector-java-5.0.8/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..90aa604e82e39eb8400b9f7882b9f0df43654009
GIT binary patch
literal 6148
zcmeHKJx{|h5PgOKr7TQ{F=ApVf&qy!&;}?H6txVnK?*{kKt(?gZ21}eQTzb@O?hWq
zC`n;OsJg4}-t~NEU!D{@24D_Gw>!WpfC^PGsM7o(GA=qLb3P(<#?EnzExh3gX)~S5
z)_^jg4E#3+<lS9Hf)O5&BKQ9Gx=GqgI4WDiA$4<Ng&wekI*zfAGaMmCr<oSAKYqw=
z;T%_JN<}f-v`g6w?BdRLbYIH+EM*4F?4gT6G0%28&UL%S9xvH(%pNY-LyKK>P-8^A
zGsf$Tx6o$nq%@a2OMb2m?r!fG;Dv0}xONZE{N2$T((g0&h#S08YuM#(xJ})opOD{Y
z`ZC%tu3;G%a~(68&;pC>BqqBJoFXpe3J3Xqs`*^bKji*9EY=7grjp}hp8faHEoJdZ
z3t6@mH8acr&uo#(ibJ)^fHI&Ad@~^XLr4{jJZ28<)<I*h0K|Y{EA-`qL25#ek;lv-
zM<~XX5?!hBR}ACI84rD4<S}#T%3=KF!}yhrzo8hrI_D2<I!xqHtumkt6d9Oze^=%F
zkAJ`a7mM_tGN2616ayw`bQ%YIB!9L}J)E4iA@!OnB6*oZTSDWHW9!IKyiT>ku}~ah
U<S}!|2t_{xEDdUufj?#73pGZOy8r+H
literal 0
HcmV?d00001
diff --git a/KEMProject/.DS_Store b/KEMProject/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c6c87c38e4ddf26730e36ac63b7b2da35b93ba37
GIT binary patch
literal 10244
zcmeHMZEO@p7=GVtfn8YX6beW=!i6GItk?pzNFZLXEhrzh@k+1dtL)t_?Z)lyal3a#
zu}Sd@H708ONHiJ@A8L%zXh8h~Mxu$vUz!>NfAqKhF(w*6e&{<pd*!ZNo0#}R;>=~|
zotgJzW}ba+=4K86Fp)P}0Ac{3(8DFuD65dTo<G;5NZ3+K63HLHu!mZb8FwUmjje2u
z2uK7Z0ulj<fJETGfdK8<JSp>pl(|GeA|Mf%M1ZdkF?zU+hjLuVVCkSNI0BHYrsg0~
zna%-$Pb`%2P>u^3xKd1Udce>X!y^U?chbkWImvh^$AuK`fWjRx>>0xo3I@HCUo0>O
zj0-7qiGW1lS_JsneHNr44;I){&hL1}DA$g-ot;MB&j3tx{d^<{R^mJ28Z&6K!zDKZ
zksj_`1s>!eQ+8(%`KbG<rlh~_rpJT+LZ6bprfACgsXD}+=0XZgnqvpJ;DAqM%G0A>
zHf_6U(*Ksu+Lq@xH($m`RrRdda};&%JpN&|a}Okk-O;44`*|;+=k^6P%P`YnxkvYh
zi{)O|wI|DZy3aC42U%T*>-f6mn7I<y{VB^a+|h)acMNZTQp8JHhCe*W7WL%J0=f3+
zj@f5<R@$;H|9(Z~pFy_d*s+Zpnquo)TF07V$J*MOn_?SVTgJxN(~7dJv9*2oKz8iO
zQ>V|Ief^C$FMY}<PfKCAWWqvGpUgj_QblYGFJq@^Hr%qJLD?&7%zitqomc1)AV(f9
zf_$X}WbKCfL`Pz=*41xiTqkKgU=Fexj}X6`sv!`mjBDpd9B+`-W^_A~w{_oaw{31r
zZ8csd=h}9U>sh|#Is^T_dDJfkDpU3E_1v7_5d<4#Ebp23niR__n4J`nLM`C1cV~GR
zug}bRBpc$*90LILt@%r$v76T3wsF(ei5gbBK&#UhrwaW2*yf&5{^|yFFJn4}<qYkm
z7wY)dVav>^wb-QgI{Jtyyq4B4Q`vcCzd>E@b`5T01e*G#^(z!*A8+r-nUsrWZDsu`
zmFY^aN7EG{Zq^!A=Bd5+5r>3pleSJ_hPubr)21z&TC@!c+o`4sVjiNgPHR)te!89;
zq2YO=ZFBt=g?+9Z<Q?zQJ-<6^I#-7jSCj#+X*UehP#Odl01fdqqNp;yZ!d?{u!;8R
zUN}tOu;cI)oP=|50WQK9@HJe4@8Jjd1%8F!;Scx=6;yE^YPb|vVgs(iX1oJ8;}+bC
z3EYXh@E+{OUOa#Y@et}bgjqa-9{TtoK8law348`$!k6(Cd==lu^Y{UNh@apk{1PYd
z8!@Ozk?-4z;}sHTqG`AmM4qTj)9CiQw%1$-G`&2ZlXGF+qQy&Ms~XpB*t9h<`N9Jl
zmNG0Lm0(T4rXpLWkfEHcHxh-T%e58Lk$(@-(mbkg-m^Iq+*(_%HK;0spb}jjU8B%9
zfJKDvmgudV->gb#o3-_v%50X<wrXvh>#SO6H)}-Johq9xs&_`)Id_>Nj8{jyRE1$B
zn$AeluZW`G!H@70QS?u&!Uebj*AOjl$2e}o?YM(zxf}a1h5fh}GicypqNRm7qGcWn
zcodK0L-+{MlaupVd=8(-7x5&%hNti}p2c_YU3?GU$8&fAFXG2Vx=tbMjwxj2WUjdO
zmTZa#UpNtXO=CB?9nWZ2wqdS~^MDoO6_Po}cAX*87r$WKRwjvnL_i`S5s(N-1g<Lt
zs>Enx{Qkdd`v3p0t2xQRN(3YV{|o`F?o4(j$Y;9W_57|qM$aL7c;a^BLIy6BaTDGi
zT*p&|U&jZR1k@JZp#=JPXg4lo;7)#lJITPEBzNcb;x_+Z|1)69U7+n1<oVw*<oW-9
HbpHPvh&}I)
literal 0
HcmV?d00001
diff --git a/KEMProject/.classpath b/KEMProject/.classpath
index 37c902f..d9f57e4 100644
--- a/KEMProject/.classpath
+++ b/KEMProject/.classpath
@@ -1,44 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/javax.jws-3.1.2.2.jar">
+ <classpathentry exported="true" kind="lib" path="/Users/wahyudinakbar/Downloads/jersey-bundle-1.0.3.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/javax.servlet-api-3.0.1.jar">
+ <classpathentry exported="true" kind="lib" path="/Users/wahyudinakbar/Downloads/javax.ws.rs-api-2.0.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/javax.ws.rs-api-2.0.jar">
+ <classpathentry exported="true" kind="lib" path="/Users/wahyudinakbar/Downloads/mysql-connector-java-5.0.8/mysql-connector-java-5.0.8-bin.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/commons-io-2.5/commons-io-2.5.jar">
+ <classpathentry combineaccessrules="false" kind="src" path="/Marketplace"/>
+ <classpathentry exported="true" kind="lib" path="/Users/wahyudinakbar/Downloads/commons-io-2.5/commons-io-2.5.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/mysql-connector-java-5.0.8/mysql-connector-java-5.0.8-bin.jar">
+ <classpathentry exported="true" kind="lib" path="/Users/wahyudinakbar/Downloads/commons-fileupload-1.3.2-bin/lib/commons-fileupload-1.3.2.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/commons-fileupload-1.3.2-bin/lib/commons-fileupload-1.3.2.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/json-simple-1.1.jar">
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/CLEAN/JAR/json-simple-1.1.1.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
diff --git a/KEMProject/.gitignore b/KEMProject/.gitignore
new file mode 100644
index 0000000..84c048a
--- /dev/null
+++ b/KEMProject/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/KEMProject/.project b/KEMProject/.project
index 94b23f4..bd7c337 100644
--- a/KEMProject/.project
+++ b/KEMProject/.project
@@ -24,8 +24,8 @@
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
diff --git a/KEMProject/.settings/.jsdtscope b/KEMProject/.settings/.jsdtscope
index cca691f..92e666d 100644
--- a/KEMProject/.settings/.jsdtscope
+++ b/KEMProject/.settings/.jsdtscope
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="WebContent"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
- <classpathentry kind="src" path=""/>
<classpathentry kind="output" path=""/>
</classpath>
diff --git a/KEMProject/.settings/org.eclipse.core.resources.prefs b/KEMProject/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..feafc43
--- /dev/null
+++ b/KEMProject/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+encoding//src/backend/javaclass/IOException.java=UTF-8
+encoding//src/backend/javaclass/Marketplace.java=UTF-8
+encoding//src/backend/javaclass/MarketplaceImplPortBindingStub.java=UTF-8
+encoding//src/backend/javaclass/MarketplaceImplService.java=UTF-8
+encoding//src/backend/javaclass/MarketplaceImplServiceLocator.java=UTF-8
+encoding//src/backend/javaclass/OrderDetails.java=UTF-8
+encoding//src/backend/javaclass/Products.java=UTF-8
+encoding//src/backend/javaclass/User.java=UTF-8
diff --git a/KEMProject/.settings/org.eclipse.jdt.core.prefs b/KEMProject/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/KEMProject/.settings/org.eclipse.jdt.core.prefs
+++ b/KEMProject/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/KEMProject/.settings/org.eclipse.wst.common.project.facet.core.xml b/KEMProject/.settings/org.eclipse.wst.common.project.facet.core.xml
index c6144e8..05dd248 100644
--- a/KEMProject/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/KEMProject/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <fixed facet="java"/>
<fixed facet="wst.jsdt.web"/>
- <installed facet="java" version="1.7"/>
+ <fixed facet="jst.web"/>
+ <installed facet="java" version="1.8"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>
diff --git a/KEMProject/.settings/org.eclipse.wst.jsdt.ui.superType.container b/KEMProject/.settings/org.eclipse.wst.jsdt.ui.superType.container
index 49c8cd4..3bd5d0a 100644
--- a/KEMProject/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/KEMProject/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -1 +1 @@
-org.eclipse.wst.jsdt.launching.JRE_CONTAINER
\ No newline at end of file
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/KEMProject/.settings/org.eclipse.wst.jsdt.ui.superType.name b/KEMProject/.settings/org.eclipse.wst.jsdt.ui.superType.name
index 11006e2..05bd71b 100644
--- a/KEMProject/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/KEMProject/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -1 +1 @@
-Global
\ No newline at end of file
+Window
\ No newline at end of file
diff --git a/KEMProject/WebContent/.DS_Store b/KEMProject/WebContent/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..35e8c7ba53cd938d2a64295a1fdcfa82c3ab9e23
GIT binary patch
literal 6148
zcmeHKJxjzu5S={_jM!XhxroITTI3(ZkP|G_B7%jDZ~-k0xx#BDr9aTpALE-3;^mUV
zPUM(@nYWqD>`vZ>OqPg3zOGWD84)E=#>o-Pi12;ZflSQ9H-pS^LDzIkSFg`$If!=0
ze`G*6_l6d9PnWc@f6Jy`S;1$(gtlVprYNfQ+mh(>?)*a{M`Eg9V^%L|`Lh<khjd5}
zs3#w-W`6oUjM%8<vG|f&w&tjtu96)Qy*lQtOyb5Fa0Z-#J!Jqrn<Y6`bn6T_1I|Fl
z0Dm7Mlrb}G73I?bBS!$>6mAiW<sS|h*#XQ9TSa&vK~sU68tjM>G#&nEahYMOsOc2!
z@DXg~U?-Fyt7HBs;S@4Ox6Xhw&}ZO4FK68U7rW2@{UpC~2AqMtVjxV5vdHmB)>{V;
u$GtW}pP(!p*D7`?7)UEdEVtqls0jR#2f)m*RfGrPKLSF78)x888TbY=DL@7Q
literal 0
HcmV?d00001
diff --git a/KEMProject/WebContent/catalog.jsp b/KEMProject/WebContent/catalog.jsp
index 1cc63ed..7953259 100644
--- a/KEMProject/WebContent/catalog.jsp
+++ b/KEMProject/WebContent/catalog.jsp
@@ -99,6 +99,7 @@
<div class="loginUser">
<div class="hiuser">
<span>Hi, <%= u.getUsername() %></span>!
+ <br>
</div>
</div>
<form action ="logout" method ="post">
@@ -261,20 +262,20 @@
{{chat}} {{user}}
<div class="chat" ng-show="chat" is="ajax-form">
<div class="headerchat">
- <div id ="user">{{user}}</div>
+ <span class="circle online" ng-attr-id="{{ 'cirU' + idRcv }}"></span><div id ="user">{{user}}</div>
<div id ="close" ng-click="chat = !chat"><b>x</b></div>
</div>
- <div class="bodychat">
+ <div class="bodychat" id="bodychat">
<!--
<li><div class="receiveddialog dialog">Halo lama ga jumpa ya wwkwkwk</div></li>
<li><div class="sentdialog dialog">iya bro! kapan kita jalan-jalan lagi ya?</div></li>
<li><div class="receiveddialog dialog">Besok gimana? jam 2 kosong ga u?</div></li>
-->
<div ng-repeat="x in chats track by $index">
- <div ng-if="x.sender !== '<%= u.getUsername() %>'">
+ <div ng-if="x.sender !== '<%= u.getUsername() %>'; x.sender === user">
<li><p class="receiveddialog">{{x.message}}</p></li>
</div>
- <div ng-if="x.sender === '<%= u.getUsername() %>'">
+ <div ng-if="x.sender === '<%= u.getUsername() %>'; x.rcv === user">
<li><p class="sentdialog">{{x.message}}</p></li>
</div>
</div>
@@ -291,19 +292,25 @@
</form>
</div>
<script>
+
var showApp = angular.module('Appchat', [])
.controller('mainController', function($scope, $http) {
onlineUser();
$scope.checkOnline = function(user, id){
var ol = firebase.database().ref('/presence/'+user);
ol.on('value', function(snapshot) {
+ $scope.idRcv = id;
var count = snapshot.numChildren();
if(count == 0){
$('#cir'+id).removeClass( "online" ).addClass("offline");
+ $('#cirU'+id).removeClass( "online" ).addClass("offline");
+
console.log(user+" sign out");
return false;
} else {
$('#cir'+id).removeClass( "offline" ).addClass("online");
+ $('#cirU'+id).removeClass( "offline" ).addClass("online");
+
console.log(user+" sign in");
return true;
}
@@ -318,39 +325,10 @@
console.log("user not nullul");
user.getToken().then(function(data) {
$scope.token = data;
-
- $scope.formsubmit = function() {
- var $http = angular.injector(['ng']).get('$http');
-
- var dataObj = {
- message: $scope.message,
- token: $scope.token,
- sender:'<%= u.getEmail() %>',
- rcv: $scope.rcv
- };
- console.log($scope.message);
- console.log("token kow: "+$scope.token);
- $http({
- url: 'http://localhost:8081/addMessage',
- method: "POST",
- data: dataObj,
- headers: {
- 'Access-Control-Allow-Origin': '*',
- 'Access-Control-Allow-Methods': 'POST, GET',
- 'Access-Control-Allow-Headers': 'Content-Type'
- }
- }).then(function mySucces(response) {
- $( ".bodychat" ).append( '<li><div class="sentdialog">'+$scope.message+'</div></li>' );
- }, function myError(response) {
- console.log("error");
- $scope.myWelcome = response.statusText;
- });
- return false;
- }
});
}
});
-
+ $scope.chat = false;
$scope.message = {};
$scope.rcv = null;
$scope.user = null;
@@ -358,7 +336,9 @@
if (user != login){
var cir = document.getElementById("cir"+id).className;
if(cir == 'circle online'){
+ $scope.idRcv = id;
$scope.chat = true;
+ $('#cirU'+id).removeClass( "offline" ).addClass("online");
}else {
$scope.chat = false;
}
@@ -368,9 +348,9 @@
$scope.chats = [];
$scope.sendMessage = function() {
- $scope.chats.push({message:$scope.chating, sender:$scope.sender});
+ $scope.chats.push({message:$scope.chating, sender:$scope.sender, rcv:$scope.receiver});
var parameter = JSON.stringify({action:"sendMessage", userSend:$scope.sender, userReceived:$scope.receiver, message:$scope.chating});
-
+
$http({
method: 'POST',
url: 'http://localhost:8080/KEMProject/sendMessage',
@@ -378,22 +358,45 @@
}).then(function successCallback(response) {
// this callback will be called asynchronously
// when the response is available
+ if($scope.chat == true){
+ var elem = document.getElementById('bodychat');
+ elem.scrollTop = elem.scrollHeight;
+ }
}, function errorCallback(response) {
// called asynchronously if an error occurs
// or server returns response with an error status.
});
$scope.chating = "";
}
+
messaging.onMessage(function(payload) {
console.log("Message received yo ", payload);
var message = payload['data']['message'];
var senderName = payload['data']['senderName'];
- $scope.$apply(function() {
+ var userReceived = payload['data']['userReceived'];
+
+ $scope.$apply(function() {
//we are now within the angular context, so any updates to the model with be handled correctly
- $scope.chats.push({message:message, sender:senderName});
+ $scope.chats.push({message:message, sender:senderName, rcv: userReceived});
+
console.log("message: " + message);
- console.log("senderName: " + senderName);
+ console.log("senderName: " + senderName);
+ var usern = '<%= u.getUsername() %>';
+ console.log("chat:"+$scope.chat);
+ if(senderName != usern && $scope.chat == false ){
+ var x = Math.floor((Math.random() * 100) + 99);
+ $scope.user = senderName;
+ $scope.chat = true;
+ $scope.receiver = senderName;
+ console.log("usernya:"+$scope.user);
+ $scope.checkOnline($scope.user,x);
+ }
+
});
+ if($scope.chat == true){
+ var elem = document.getElementById('bodychat');
+ elem.scrollTop = elem.scrollHeight;
+ }
});
////////////////////////////////////////////////// START
@@ -455,15 +458,16 @@
var email = '<%= u.getEmail() %>';
var password = '<%= u.getPassword() %>';
- if(<%= request.getParameter("login")%> == 0){
+ if(<%= session.getAttribute("login")%> == 0){
console.log("success create user");
+ <% session.setAttribute("login", 1); %>
firebase.auth().createUserWithEmailAndPassword(email, password).catch(function(error) {
// Handle Errors here.
var errorCode = error.code;
var errorMessage = error.message;
// ...
});
- } else {
+ } else if (<%= session.getAttribute("login")%> == 1) {
console.log("success sign in");
firebase.auth().signInWithEmailAndPassword(email, password).catch(function(error) {
// Handle Errors here.
@@ -471,6 +475,8 @@
var errorMessage = error.message;
// ...
});
+ } else {
+ console.log("success sign in");
}
function signout(){
@@ -537,7 +543,7 @@
request.open("POST", "likes", true);
request.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
request.send('token='+token+'&type=3&product='+<%= p.getId_Product() %>+'&idUser='+userId);
- console.log("lololol");
+
<%}
}%>
}, 3000);
diff --git a/KEMProject/build/classes/backend/javaclass/Confirmation.class b/KEMProject/build/classes/backend/javaclass/Confirmation.class
index f79e49a0a0ce2526b00892415532ec5ba47dc605..dda8f37328098a087e91ba91906499ef14a6ea1c 100644
GIT binary patch
delta 17
ZcmdlkvR#DZ)W2Q(7#J8#Hgf250RTWv1_b~B
delta 17
ZcmdlkvR#DZ)W2Q(7#J9gH*)B60RTWq1_S^A
diff --git a/KEMProject/build/classes/backend/javaclass/IOException.class b/KEMProject/build/classes/backend/javaclass/IOException.class
index 257ed018a0538aa43ce83ffeb6892c341d3f8a57..ec43dd45fa2465e31f99fa052df890d910163409 100644
GIT binary patch
delta 17
ZcmaDP{YaYQ)W2Q(7#J8#HgeqJ1pr6b2NwVU
delta 17
ZcmaDP{YaYQ)W2Q(7#J9gH*(zK1pr6W2NnPT
diff --git a/KEMProject/build/classes/backend/javaclass/Login.class b/KEMProject/build/classes/backend/javaclass/Login.class
index f26f2b0c9c8ffaf8ee611376b7ab633ae5ce3899..a9f8caa9ba5c38ac996d1cef2ff6d888fa5d5766 100644
GIT binary patch
delta 466
zcmZXQJ4{n?6vlt&_Ho<WURsbq7{q}A#0Ml)2f7dfLlYf3;ADtbLK+$<hz(oA&fwr3
zU~qA8fr$X&p)eENATAOW#TO_lZ+QruqMOVA|DE&wzwdnK|D<BM!df_)nFC^Cj#_uD
zq_49()seAy%ZkZ6p)l?AIW?V5CRLNjWZP5iy<yV47fPxUmv8+?#sjPhp*AP$sL}QG
z!=ACM)nLfJI}vt+ar{I<=EjnCpGd-;FNoR8-YMQpv*h7w(FfOzO!iOED6=#X(p(D^
z=LLkZwaTN9d_vCAXTD%y$v9tG!@~s`VV!SyxhPNh&IUdzWso0={M5=Le)0>Gq;#>#
z76DqMgKcGl+>=%o6<Or^X=I089sf#g_t+;SWjy0I2ZZGs)f}qWmRdD9Qb~a{Q2Gzu
z=Pu8+XUhO}ygp|ibA@C65aC2ODACA&qnv7#Tz-~r6B0dmN#K+R?u+Q~O)*S{Om3Le
gqw~x|%8$9E)e+4Y;?dWJc*Uo;rQdN|J^lXR8P5QAyZ`_I
delta 403
zcmXYtxi3Uv6vcmcFweZ1F@g{U3WX44#FCH*L8uf83Q<@JvBVOh6TOJSi$oz&sOXqN
zEb#}>5e>2L`@W9t&QRTR@45G!^L<;%<H_dA_rfxeEzFoTW=wQbLvKTSXLDw2PgjxF
zmX5+K-;7yolRN9dWjXS(6A7~98+P}JR9Io29A{d*eV+9Y(xbMla?jj=j}lp=45tdO
z5EEF(g<HD-+GYm{qFwf|VahD~91udZOmWB&p(Mxz$D9yGii~oq$c|TrIO80HDrw__
zOTwv^X0DWVP%m|?DKhCFpoD8~)P6%xZ@I%M@l0~h11`xRjYmCpi&q7n^dv%xiTg*5
z)Uv2Ew+xcSW{@2rm1kb?@TxC})yRKQ-ZV;o(Cb~jK9pM}{D*GKA32?e-(buj*PsC9
ej1Lk&Nz%?wsVaQxwv8{owVL`Jm3aBFJAMHovuDi!
diff --git a/KEMProject/build/classes/backend/javaclass/Marketplace.class b/KEMProject/build/classes/backend/javaclass/Marketplace.class
index 0d987b8d27e20479a8469f9971737e12418796b1..8ef4fef8ac3db4d59ca8f818c97331cb6143b094 100644
GIT binary patch
delta 17
YcmZqUYvbcM^>5cc1_lO`jU4~j06P-~VgLXD
delta 17
YcmZqUYvbcM^>5cc1_lP>jU4~j06Pu_VE_OC
diff --git a/KEMProject/build/classes/backend/javaclass/MarketplaceImplPortBindingStub.class b/KEMProject/build/classes/backend/javaclass/MarketplaceImplPortBindingStub.class
index 7d012bb847c468e0fd8db577c4c75078c25cd933..0bd1c45b0291a4d73e01a257eb729285193fb0e6 100644
GIT binary patch
delta 19
bcmX@Uf${hTMvhbecI{(eU@+OpVIKhiS&0X|
delta 19
bcmX@Uf${hTMvhbecI{(eU@+duVIKhiS%e3?
diff --git a/KEMProject/build/classes/backend/javaclass/MarketplaceImplService.class b/KEMProject/build/classes/backend/javaclass/MarketplaceImplService.class
index 7f8099f345932d4b47ff529b773650d6b585a403..d2329ae44eafc5cbf813e44fe47d7fb4c7ee3c6d 100644
GIT binary patch
delta 17
ZcmZ3_yq=lk)W2Q(7#J8#HgYUy1OPrZ20{P;
delta 17
ZcmZ3_yq=lk)W2Q(7#J9gH*zdz1OPrU20;J-
diff --git a/KEMProject/build/classes/backend/javaclass/MarketplaceImplServiceLocator.class b/KEMProject/build/classes/backend/javaclass/MarketplaceImplServiceLocator.class
index ee311bfa4ad81c8f117c245354ec276965534368..1b7fb2bfccc34700227fea9ac9c535b6d71adcf9 100644
GIT binary patch
delta 17
Zcmcbqa#Mxl)W2Q(7#J8#HgW_C0RTq129p2)
delta 17
Zcmcbqa#Mxl)W2Q(7#J9gH*y3D0RTp{29f{(
diff --git a/KEMProject/build/classes/backend/javaclass/MarketplaceProxy.class b/KEMProject/build/classes/backend/javaclass/MarketplaceProxy.class
index 9e445265f4e299928f16975cea29e3638af31000..0513767b1e9ad32065a96c86e28d8e796fd87f9f 100644
GIT binary patch
delta 17
ZcmbQMJy)CK)W2Q(7#J8#HgZfA1pq*n25<lX
delta 17
ZcmbQMJy)CK)W2Q(7#J9gH*!oB1pq*i25$fW
diff --git a/KEMProject/build/classes/backend/javaclass/OrderDetails.class b/KEMProject/build/classes/backend/javaclass/OrderDetails.class
index 0e8eeaa4c19c38c0063043abd3375a9dba04489e..b5aba38329666bbc21169db440d261876d801bd3 100644
GIT binary patch
delta 17
YcmZp!ZLZ}w^>5cc1_lO`jU3f>07mBq?*IS*
delta 17
YcmZp!ZLZ}w^>5cc1_lP>jU3f>07l{l?f?J)
diff --git a/KEMProject/build/classes/backend/javaclass/Products.class b/KEMProject/build/classes/backend/javaclass/Products.class
index d64bda931332a22cb7a8c02b5edfcc970efb4674..10fd65f8fcf194b38defcdfb8a2026324eca65f9 100644
GIT binary patch
delta 17
ZcmezC_1BBz)W2Q(7#J8#Hgc4z0sv452VMXG
delta 17
ZcmezC_1BBz)W2Q(7#J9gH*%D!0sv402VDRF
diff --git a/KEMProject/build/classes/backend/javaclass/User.class b/KEMProject/build/classes/backend/javaclass/User.class
index 2c029d9a030f5ddf57d3e100d73dcc95f5f79429..a7ed47fa38b03bff1d9c8dd7b509ed7f9b25854c 100644
GIT binary patch
delta 17
ZcmbR3KHHt+)W2Q(7#J8#HgZf>1^`2-2Cx7C
delta 17
ZcmbR3KHHt+)W2Q(7#J9gH*!o?1^`2&2Co1B
diff --git a/KEMProject/build/classes/backend/javaclass/addProduct.class b/KEMProject/build/classes/backend/javaclass/addProduct.class
index 8b0315893a9473e2f97d873fbc568068c6fa33f8..3682a587caa0186f12c331d4f85ba35b296a54d3 100644
GIT binary patch
delta 17
ZcmX@0bwG>b)W2Q(7#J8#HgZ^q0surF23G(8
delta 17
ZcmX@0bwG>b)W2Q(7#J9gH*#2r0surA237z7
diff --git a/KEMProject/build/classes/backend/javaclass/delete.class b/KEMProject/build/classes/backend/javaclass/delete.class
index a99180f6718d46804f5b0c7927ecb06d1bc1836d..59ecc208f4d05c9cad0756e06e5af73b6fc4f567 100644
GIT binary patch
delta 17
ZcmdnYznP!o)W2Q(7#J8#Hgc?H2LM1U25bNT
delta 17
ZcmdnYznP!o)W2Q(7#J9gH*&0I2LM1P25SHS
diff --git a/KEMProject/build/classes/backend/javaclass/editProduct.class b/KEMProject/build/classes/backend/javaclass/editProduct.class
index 92c1adf4fa6296765d5fde517ec7da590c87cfba..1e90ac4635ccdfdb351df862091d54d7366827c1 100644
GIT binary patch
delta 17
Zcmew%`9qT9)W2Q(7#J8#HgbI60RT#e2UGw6
delta 17
Zcmew%`9qT9)W2Q(7#J9gH*$R70RT#Z2U7q5
diff --git a/KEMProject/build/classes/backend/javaclass/likes.class b/KEMProject/build/classes/backend/javaclass/likes.class
index 9f18f5329e865224b6d53d0efc5bd67abc5a2754..6b940c343f3f946cbc8e023571ee7c05fb6aa017 100644
GIT binary patch
delta 547
zcmW-d%}*0i6vcmU+L<>U3Ydlh6VfPRj7e)MicpJuNG*!rN{gQ;wH@iiW@ySJ)|G2l
zCe9z>nvj^(g^64D{sAsc+!{AVz3t}S`|{4Y=bZcV$nR0->)%hGfjRsG=bK?W%yLe1
zHtNP^a&uUU(RRlV!p*Q&e_83&>YmNK!txu{eXlb_fuiPuA`^WvGG>xRE=E6ME91)w
zC-k~uzTK+%!4RvgX)Z;}@$6WM%ZibGFD&f^p%;Xe*KO~;F|n{^v#v0!mG#qwKH+MT
zjXrd&4{g>&JM=o`puX4egWW#hdXgL5j1J?ctlQkx+=;%&Cx`E`sn7${t>Exayr3c#
zOGhQkRWG7#>s`Xf!jZ_`=$BQfe84H%uKkfSu6E6IJd;hG?=fM}W5HzJ&ZU-mtQh1{
z<sMh0_qe7gCfr0?NVg79<mC#Ba<|xEZIO}at)6-_#S$6TILZT#vBNY?j?-p_SDau-
z473NeOOj!Ei6JUfWnX{V;y#A_v=|qD43}p-lqoL!Dkph_NlxNF=843~%cZt?iWW^%
wkUQArfox5xEkZWWsgs}~%cn8^iC<fzG?SWDCEe3xwd9a-))Ei90yJp;2bDTx3IG5A
delta 720
zcmZvaOHUI~7>1uS?R2JP6f8HZDT*3H0$LTt3d%*q3nGFo7cZz|8KJbD)^;$kDnCHu
zVz%yGxj++=x-fC8YyX8y6L;!2T^cuYzBA`}-}n2@%&*oTZLzPvKYa!U@pfb1wR)7Z
z3>utMv~Acg?Nrfr*HW47n&*@(&T~N#DsOs<&Y9+MzMPt?=3Ou2RUNxDVscSomh9SQ
zp-?WwxWtITu%i7xu*GGrD2z&=FS=scH?!eKv;)>+j4>t*#uYvOTfOJB#Z@AT)+U<q
z>|7yRwR4WiHAN)9x=?efEnMfO!3{;y|Dq*zi(5?l%b~HZ8AZ%<w!BoOXy@G)W|=d%
z>%R~6PtOMp?5{cAWZCr`*UN5K#5AMO7qZt+r2}@sVlkjP0&3lsSkI|Wxw-Oc-dziT
zWsCbf@Q1^Fy^nZou=4M;OVzwcf@z<8d>u|J|C`>YUid%tH_=TZ#N_gK{8y25{R3y>
zLwls(5gRrW<{qO7BcXSOll}3@2HhGBrgVnPf%xqPcQgj#_ZnnnZLp*mjwYg=B6_%s
zBE>k9a*3g){V1&x633#Q1RWfwivhZYN|5G|u!otVo@AOMJmo0s^its%TY}a(L5s*M
z&F7Ao?311JETk<_LG_Frnw)rIyegpy)^MZ>i++WZJV%$nth`;9iBrszX9Gh*bqW+Q
wgVYI1A~7Y@lpoC{N?FW%(f-INrhzgzXfUf}tr+wh^1-DXi%1Vu0X1rW0a=lbAOHXW
diff --git a/KEMProject/build/classes/backend/javaclass/logout.class b/KEMProject/build/classes/backend/javaclass/logout.class
index 6bee0f2f6a7afd2921b5e05b28abd67d65f04857..2f3cbcce0b54ac5b129c846301f233cd7813a8fa 100644
GIT binary patch
delta 17
YcmZpWYmnnO^>5cc1_lO`jT}Gt06Z@ScmMzZ
delta 17
YcmZpWYmnnO^>5cc1_lP>jT}Gt06Z!NcK`qY
diff --git a/KEMProject/build/classes/backend/javaclass/register.class b/KEMProject/build/classes/backend/javaclass/register.class
index 394218f041da1682d170631c9ec97758f6978e53..ea65e4f5e0938d127191f34d368efa444466785f 100644
GIT binary patch
delta 534
zcmZXQ%}Z2a6vlt&UT5x|J9nC{+C+<(=mU*JnNoukguul>ByNhJ7PrzNkx`sMmxBEX
z7Yc$l>8eeH8+BouAaFNrDy+=RJ}vvOQfJi8Ozm2|zw<utd7tN;t;5qtoVo3pS)f_$
z`%cQ~4)qUYu4Nrwuwe00@cR5=zp3BPW}4F3d{3rl$R*D!AyJ<`dgec|&E~Zbz2fJ6
z{iv}oHyB)U3K4tI&*er2hOSOFM8`zdgM03cNRlvnz&J2@Huh8`9n{5JTyu)&(>yk5
zs9p?u<4;ES(q$y+CaNJz>?^;=C8kxGmUx3yXqmSdI7WhZyvL-*i1C4sRI%SMIm9PI
z)X4@bN?}s6%4a2uHd*G2l1-<~lTwP%B?V3>Ib0Z(N31GFxh%7M<(ry65TEb-&=7NS
zjx|+xsp)Bc@{721u*h%Lm9BG}4K~>=H#taAJ3P6iMkVd2mb=9N(L*jWqj#Px(N3YF
zu4sT~O2=ztjbm)FO)Wb*bV8@BMA5O`zqTT3W~f%g-eEpi@J<F3-gv8+7I!Q<EX}4d
etW6Rnl3Eq%#E`1;3MC|AJssWRc}|HHj{E^@T#6k4
delta 462
zcmXYtJ!q3*5XXP_R`Vur5@VVs&>;%3B7q`?qC-UjigYZ3Ai7AbV3lHmDRhkB;?V7d
z3c5%}H_6mc>e4P*Bwe)lZTyN&Y8#`q`Kp(s)APH#=kEW%TRh$#u?n61GB75_b1P;=
zoT)@QJ(s+9)5$v_FqN21%p`A}ypvAF^}T)f+$nqBD(0r$_eE-U*|XpZ;~)sek=#S?
zYmo^%;X7>&I~Q3SV07@Uo%OxS1er9#T*9qNErz?l@!-{{OYixB^ynj>FtCgvK2u_V
zfZ^r~UpYY75RUPUgPf2ZzAHJ1NtGW;CTFF@8zm<fWu2Iki%EIOn3BcSjI2^tbaO+N
z_{oNfzmV%xsH%yATxL_Nhji?DezAp5;%aG|n$iQF@S8e^<q;A7Xop`OtI%KV7?fxD
z_GyJ{<TdA4E8`S<)rwkKSBeItPLv(~F~qJe9nvlPRvK!hFWb~nE&HjzbcVJ`)+BDK
f9U7PoLM@JJ)Z~ITcDh$%PcMcpCtP7%#Nql6Lg08!
diff --git a/KEMProject/build/classes/backend/javaclass/search.class b/KEMProject/build/classes/backend/javaclass/search.class
index 1bc3e13059425aa6a7697bcd1d542cd876b25156..970c306eb6e562d7ba46e5fc2ab4bd584dc20b58 100644
GIT binary patch
delta 17
ZcmaFE`G%9@)W2Q(7#J8#HgY^+0RTq_2M7QF
delta 17
ZcmaFE`G%9@)W2Q(7#J9gH*!2-0RTq=2L}KE
diff --git a/KEMProject/build/classes/backend/javaclass/sendMessage.class b/KEMProject/build/classes/backend/javaclass/sendMessage.class
index 165e30d78e2b2d574802bb47f5bbb5a9b335b929..51c949cdf9763b89f183e262c441cf47ca1f2f92 100644
GIT binary patch
delta 17
ZcmX@FdR~>|)W2Q(7#J8#HgX&n0suyX2KN8}
delta 17
ZcmX@FdR~>|)W2Q(7#J9gH*y>o0suyS2KE2|
diff --git a/KEMProject/build/classes/backend/javaclass/urlWSDL.class b/KEMProject/build/classes/backend/javaclass/urlWSDL.class
index 4d23d5f00ccbbcfd805031230bcd1c10af2a8b96..1b4460aa207598b6fb45ed0fb502c4db0ec8e8a9 100644
GIT binary patch
delta 28
kcmX@ga+F2j)W2Q(7#J8#806R)m>3x(Cr*^ys42q)0E37JivR!s
delta 28
kcmX@ga+F2j)W2Q(7#J9g8RXa*m>3x(Cr*^ys42q)0E2i3iU0rr
diff --git a/KEMProject/build/classes/backend/javaclass/validateToken.class b/KEMProject/build/classes/backend/javaclass/validateToken.class
index 3f7a499f117200331f536881387756f67a18403c..b7a9237552495a6cbbd02234a9776ce10a2fb773 100644
GIT binary patch
delta 17
ZcmbO$H&>41)W2Q(7#J8#Hgbsa0{}h>1<(Kh
delta 17
ZcmbO$H&>41)W2Q(7#J9gH*$#b0{}h+1<wEg
diff --git a/KEMProject/src/backend/javaclass/Login.java b/KEMProject/src/backend/javaclass/Login.java
index d6bfe7b..9eb9315 100644
--- a/KEMProject/src/backend/javaclass/Login.java
+++ b/KEMProject/src/backend/javaclass/Login.java
@@ -62,8 +62,8 @@ public class Login extends HttpServlet {
HttpSession session = request.getSession();
session.setAttribute("token", token);
session.setAttribute("userId", userId);
- session.setAttribute("password", pw);
- response.sendRedirect("catalog.jsp?login=1");
+ session.setAttribute("login", 1);
+ response.sendRedirect("catalog.jsp");
}
}
}
diff --git a/KEMProject/src/backend/javaclass/likes.java b/KEMProject/src/backend/javaclass/likes.java
index cb41aa9..d93fe3c 100644
--- a/KEMProject/src/backend/javaclass/likes.java
+++ b/KEMProject/src/backend/javaclass/likes.java
@@ -23,7 +23,7 @@ import javax.xml.ws.Service;
Marketplace market = null;
try {
market = marketplaceimplservice.getMarketplaceImplPort();
- System.out.println("masukkok");
+ //System.out.println("masukkok");
} catch (ServiceException e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git a/KEMProject/src/backend/javaclass/register.java b/KEMProject/src/backend/javaclass/register.java
index 2390902..ee0981d 100644
--- a/KEMProject/src/backend/javaclass/register.java
+++ b/KEMProject/src/backend/javaclass/register.java
@@ -75,8 +75,8 @@ public class register extends HttpServlet {
HttpSession session = request.getSession();
session.setAttribute("token", token);
session.setAttribute("userId", userId);
- session.setAttribute("password", password);
- response.sendRedirect("catalog.jsp?login=0");
+ session.setAttribute("login", 0);
+ response.sendRedirect("catalog.jsp");
}
}
}
diff --git a/Marketplace/.DS_Store b/Marketplace/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..feca8613504bcd7430524202412f605a970dd548
GIT binary patch
literal 6148
zcmeH~JqiLr422VS3&Cbf%V|7-HyA`u-~~i21wpZ&qx<s1f~&QNyg>41vI)z6#m+=T
zbn`f`MFtU>!%bynVPcAXCwIBY>3lz3j@RpDteEA>YT$!Ro{xoGkN^pg011!)3H%HJ
zJGWu;MJOW)kN^pc1nmD%;HEXTh5D}p!AAgSkF*=sK1)E0C7?C6g(3sfXoW_r`WRw)
zZ-<twtEnwC+C_8t(0sGn6a&*}7cJPpw7M{m00~S8bg>`o{NKSp&Hs}YZb^Uy{)~Y3
z+x>QfkIJ+4?ei>u$gHg!9O~r=FP8vp>?mHs-SE8F0$NjBC^9f!1RMhc34E2n6Mwc5
Aa{vGU
literal 0
HcmV?d00001
diff --git a/Marketplace/.classpath b/Marketplace/.classpath
index e1de908..6386d8d 100644
--- a/Marketplace/.classpath
+++ b/Marketplace/.classpath
@@ -1,39 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/commons-fileupload-1.3.2-bin/lib/commons-fileupload-1.3.2.jar">
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/BACKUP/JAR/javax.jws-3.1.2.2.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/commons-io-2.5/commons-io-2.5.jar">
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/BACKUP/JAR/commons-fileupload-1.3.2-bin/lib/commons-fileupload-1.3.2.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/mysql-connector-java-5.0.8/mysql-connector-java-5.0.8-bin.jar">
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/BACKUP/JAR/commons-io-2.5/commons-io-2.5.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/javax.jws-3.1.2.2.jar">
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/BACKUP/JAR/mysql-connector-java-5.0.8/mysql-connector-java-5.0.8-bin.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/javax.servlet-api-3.0.1.jar">
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/BACKUP/JAR/javax.servlet-api-3.0.1.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/javax.ws.rs-api-2.0.jar">
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/CLEAN/JAR/json-simple-1.1.1.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
diff --git a/Marketplace/.gitignore b/Marketplace/.gitignore
new file mode 100644
index 0000000..84c048a
--- /dev/null
+++ b/Marketplace/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/Marketplace/.settings/org.eclipse.jdt.core.prefs b/Marketplace/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/Marketplace/.settings/org.eclipse.jdt.core.prefs
+++ b/Marketplace/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/Marketplace/.settings/org.eclipse.wst.common.project.facet.core.xml b/Marketplace/.settings/org.eclipse.wst.common.project.facet.core.xml
index c6144e8..05dd248 100644
--- a/Marketplace/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/Marketplace/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <fixed facet="java"/>
<fixed facet="wst.jsdt.web"/>
- <installed facet="java" version="1.7"/>
+ <fixed facet="jst.web"/>
+ <installed facet="java" version="1.8"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>
diff --git a/Marketplace/build/classes/backend/endpoint/MarketplacePublisher.class b/Marketplace/build/classes/backend/endpoint/MarketplacePublisher.class
index 68aaca43dddd323d2badb6209cc61c4416b95b71..c3469e73e701532fcdc194efc14e261d91aa4f43 100644
GIT binary patch
delta 17
Zcmcb@eubUm)W2Q(7#J8#HgcR{1^`2v2D<<N
delta 17
Zcmcb@eubUm)W2Q(7#J9gH*%a|1^`2q2D$(M
diff --git a/Marketplace/build/classes/backend/javaclass/Marketplace.class b/Marketplace/build/classes/backend/javaclass/Marketplace.class
index c68eb887a35b99ec908d25709e68331c5b7f9ea7..56711ece63a57fcc1193154f28320b6b3c1bf5cc 100644
GIT binary patch
delta 17
ZcmbOxFin8t)W2Q(7#J8#HgfQB002921(*N;
delta 17
ZcmbOxFin8t)W2Q(7#J9gH*)ZC0028|1(yH-
diff --git a/Marketplace/build/classes/backend/javaclass/MarketplaceImpl.class b/Marketplace/build/classes/backend/javaclass/MarketplaceImpl.class
index 655df44720f70940f928b058abc6fe678b1ca6d4..7cd3f71ccb745aa9386fcc0248201ee40a412a29 100644
GIT binary patch
delta 1695
zcmYjRZETZO6h7y)>-zETi;cP3&6bwYfdw4kWZeeLvF}f|u49b3b*yxQb{lKQhcGs#
zh{^_xi$jp{X(SjG^-YSC1o`0)HSvduF)<;M7$Yh%5Hf!(e0km%M1J(V&v~Bb-h1x3
zxA)LZ{N*n+e)r(ZD*&*J&V6RAwTK?eu9W8yj3HlmV6!dk>+$JnAwsUWn7&X<rpM!A
z;ZC>C%|_7lcDs#mk(Nrd3_20w0{%#OXIou=Z|A^<h@Nu9VEQ6lE<Q?M9p^^Sbq<6=
zJC^7vU))dMhJ|7vV>gzF=?t%>Ormo57(w6X>ks?Odm=_as+6dTs)hf#i|7%vt=3F0
zg2CysmHGMuz5+e1MM!YjR{O&n`n&rg-Mu{pPCcy?&DM3=R}iv9d%R7!9C~rxdd1Ko
zQ46itQ>XaAb|Sb@qJUDc=~2NAzM#KfPu;vDr;F#<jF9RoYOJp>uJN>a%BzbTJcZSD
zu9YsQvfGeEJzztK<-s++kWb<IB-)~Idgj#f6f!JPga*VXbE<K-xHqRjw@1P#jfj=@
z4DIU@?G^3zl;V97y$NYtO4uJM83+b@d?CLPDzJ(J?U%3~(v;Mzqz5EAsCf14Ee`p*
zg9<q=(P1%Vx8pnFntc%-l}(O1yWuO)KoS6cC_0P3O*6-sr71W?;EpxNPQf{ZCUa~u
zImG&s@4Mg@+<_3xU<~RZghot7Gv{e=3mwpp3or+Bna{>WfzG^zh6MR+O(7JJ8R1
z0K>SIzr#3+2l+dWlX#l_8j$#M-GO{DUfMKt7k<Qha1HOnANYV*cnH&kFhhEHKn9E<
zBN{0V6DS^2DFH2%hz=smBrPr=JuYTX4tw(0vx+^X?5SdphhosndJF3vtOr;RvL0rA
zJL`iq3x`?XJH&=jHjJ}jf(?^wILn6flnilP<~=YgO@nwy;7magumdWHGGQl>ismuW
zsOm0OwV=WCFbKOL26Xs748btyz<_6Xw)+qZ5}qU{kI+LR&OQ!%c!&W~Z~{gc8TmX9
zi-%>!<@4Yn=MqfwH2Yzchh;Jvg9D5#kGVvwdV;n;L1+I%aFA=hAjZnGaHp^q&JjPC
zcbKziK5xJPp!=IkO$MMFpJQS&EfAiH5|ir^q%MqtIhhuT+RAM4Q^jJ(3(T1lqO>H6
zX;H|CqUAEoYEGsXpYmR<OcD8&deci!akZ5zFjpL?bei)1XXUGvBN~&^G437RpaQwN
z_D|HTpp_zbO&P9|N7l6Q0gGQ7ve7B0c=Ay5G8GAHa}jG3jc!Hzp~=bGOp^mOs~>B{
zta(vPt@};Y=gD8UtiXiQOH@&F9*l0SSsSGqk<{84R||XjuoAgPV^k-?t#dVNs9qdz
z&9gOdl`eJfjU0J|(uO9Ej~db}|I;e-^74iDt*GJGL)bg&uvHFs+*H^$|3=ibQM>qN
zWBxOxQS!NsX6aF*Ht@t|W0d^D5}1o!VpSl++odd_<1njGL9rZ?X_Erk7<|HW(yK}q
zj@<kysN;Wa;$`qQE5`myu-2VqPSl!{)Kr!O$7tzRzBtOwyiVH~DL3;vZD*ua(GEs2
zDteWXPDMNAp-sP|MtNSlf;Pjh>dUx|Pk2y_2cL}@vV1|q@~1&7X1?Y!o1*lF8sAdm
z+iDzD<Cq!`$<v{`ghJfzTaHJ>{4LoyA-8NfLinz@9nLcy<5gp!2#(TmIVZ9Nv)<!d
fN_2uI`D@~L{v`iSh3Pb%VS*oiJc;}0tj_Q+8W@dx
delta 1818
zcmYLKe^69a6h7zdvio-T!7i+p+p_I~;)+2Crs)DI3CIr-1Yt!*SYbhQ7jSpcNCJOk
znu@5`B+I12(x!3D))vtjn(B|HW}5yli>7IE%xR{XW^yKfb>0K<k3ILh-}l{f?>+DA
zd%ygN$M2x=yNB1u0bn70c*R(0x0>5qTwS5gmhR?=tF7Dbk!Y^)+WTf?A{c|daQAjs
z*w^8cC<|e!=#9@5hmsR8TcjmB-3t*ko$VeYT&6`bEru3^_%?r}w573XGND9E5Yk0c
zf<sxQ^&l))Q%H`aB#H76bS>S%U{8)j%Mh|upXBi3O3~!#!xAy!sI!;JR1TLAq%L15
z>@V$z7y+q5rZrS4s-C@!btj$9wDkxEcZRFP7i#n6OSA#OoZ%|;hnqv~U6J<Aj(oR7
zn?#{=12&0a=WRoaObxVIqE>Ojb=I|2rgr7*rpdF{_yYcrMBDjt?hIZS6cs6stWKG_
zz=fb^(;8pUr(8NDQ&{07=G46vvRkH|v`d^xslYwrR!Y8Zzl<?@P0UYqG`ud;L72rm
zh5eD*us_t{3;K;vMsLV;_%UDH9SBVExLOehWUPi+jId6b9+&Ba;*~f@QP9^OP)H%u
zDRDkE)i}iUE-YGIw5~{G+fx$qQzbfs;GUu|d8YWnX^J{$yHgD}K?{ih_@$^U`Znt`
zwA_HCdMnKyg{P8ZI4cH@7}{-dHhBz&2|Rk6ehfwsyf(d+(!_$|@B2}Q1_+`BlhMgz
z3TEO02=d`{=z$OxU<Fn&UyYm5r}7ru&Kr7IQN|$lU@z-^co+wG9KsR&h{ua~6-U{x
z0h#;sU&v?gkD$SyK!-QMfIowb6JSBnyJ|)MfAA~bgFAR1{=o<E2p{t1kI+Pj7Lsr#
z88DfQm_qS5ml80O%$P$K^blblX|aGk#q6nIPc?hI?AgqoX7+5SI1I8LV!em;KGyfM
zewg(^)=yCq4)wF)EE`7HaFGp{*l?8%V{8~FE5!2+?t@J!GbDhSX9|iyDxiYM4ZDF<
zG>?%+ReM?0@_onQRp^5_zV!|0hdrR<yI<pM4?xcq_?*&tg-zl@T!Fp3!~iq!66|AS
z<VWza_@ShzG#?)ETt*Y8IRZx+<uMw7V~ld9I14sUqrqu3_87q+pZOEfP&!X@7pg^K
zYr42xy1_P|p5rSR0Ca!xVXXjki(AM_86vf;*z`O%QDzKmR$3q&<=NtVSyovNb2f8~
zUYKsK$%cFJiI-P!+j-2~b>_*glP=(*N!!vVHcq(=bH%1|w<-S#8$DLOPh(Qb$OWZa
zv^;9Byp5U_R3P+gOYo&=)!IfvxA?Rs8`Gn|)#Re4kcxz>b|q`s^>rw&*Zt1=u-DD{
zH{RK(DW1|-vF=gU4twWDPi|a>=F(AGz2*WKJzASKMpa^BQ*HcOIKWTP!i5{4YEjTI
zM^i)V#MXvfS1q41LoJ7wBd<^@Q_pd-MjNAFH$*vobXU_()bN{0{Ozm4#%RHoI|`fW
zZ$*udwusZMc~6(dsM%w*$&*F#b7Gq@Ms4DD>m1xB651Sf+mtPI9FhtYq~~CzfCAar
zG0pR2hbq}Qa@EJ6ivQ*O5~!<JjFC}T?@6>-w6;Wb8r|D=h8Die-K4bZ1obdd+I50n
zVWd^jZboq`Qd(H2qF198+x|d}^15Cea2fh4Zs0C{%k+!Jz%y}s?bm2uv@hVqv;!G7
zQ;ZI&@rW9as_~c_2i15o`c?2A;hSQ-YYCnfce}Fjt!Vm=Q-p7e@o=u`9o|(BD`AMv
oMzxU~ocAubF3~v}=F!C8jraKXewaR>5hnOUg6Hrco!1%u2UJU;G5`Po
diff --git a/Marketplace/build/classes/backend/javaclass/OrderDetails.class b/Marketplace/build/classes/backend/javaclass/OrderDetails.class
index b4d14866a7cd6cead3d25d576bbe2696f0a5c8b9..969662d3c320ad93e300be1c0891c95dbd95834b 100644
GIT binary patch
delta 17
ZcmZ3ivRH-V)W2Q(7#J8#HgZS{0RTUZ1@Qm?
delta 17
ZcmZ3ivRH-V)W2Q(7#J9gH*!b|0RTUU1@Hg>
diff --git a/Marketplace/build/classes/backend/javaclass/Products.class b/Marketplace/build/classes/backend/javaclass/Products.class
index fb21dd9831a6609d4a6d8c1d0b3a86a1c2b52494..4b660cbbc9ace8384e03e56e8f05602653249d97 100644
GIT binary patch
delta 17
ZcmX>hd_tJx)W2Q(7#J8#HgX)`1OP*D2DJbH
delta 17
ZcmX>hd_tJx)W2Q(7#J9gH*y@{1OP*82DAVG
diff --git a/Marketplace/build/classes/backend/javaclass/User.class b/Marketplace/build/classes/backend/javaclass/User.class
index b79e4cde4f46d9e7d481b055b1f223edfa3444b4..d2f724cf4b573ad8787b0f4d667e10340be41545 100644
GIT binary patch
delta 17
YcmeAa>J;KQ^>5cc1_lO`jU0@e06Fvpb^rhX
delta 17
YcmeAa>J;KQ^>5cc1_lP>jU0@e06FgkbpQYW
diff --git a/Marketplace/build/classes/backend/javaclass/urlWSDL.class b/Marketplace/build/classes/backend/javaclass/urlWSDL.class
index 4d23d5f00ccbbcfd805031230bcd1c10af2a8b96..1b4460aa207598b6fb45ed0fb502c4db0ec8e8a9 100644
GIT binary patch
delta 28
kcmX@ga+F2j)W2Q(7#J8#806R)m>3x(Cr*^ys42q)0E37JivR!s
delta 28
kcmX@ga+F2j)W2Q(7#J9g8RXa*m>3x(Cr*^ys42q)0E2i3iU0rr
diff --git a/Marketplace/src/.DS_Store b/Marketplace/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d8c5ea70307e1bb3470de73ddb9530d911c7b734
GIT binary patch
literal 6148
zcmeHKJ5EC}5S)cbM50NV(pTUHR+O9|7l7nZ5s?DXzlw8lG-f{q(IZ__1kFn8vDZ7c
zJjL6$0BrR+JOK*;bGjqGe3+W=yHD({B1WY1j90v47(Vug-Eorrcfh$1*x?0xy#3}M
z556Un0#ZN<NC7Dz1um>W71;UXh0oP-Qa}paz5@PzXmrP3I3~uYgG00c#2Le3oJTJ~
zY#t!?!ZDE%nkAK(RI3)llFoRmyk0maCLLDIht<ti9g4;6JikRctS4%e0#e{qf%{x8
zy#8<KXZrtBl2%ec3j8YtY_{I6SA0^{*2&|%);9Vx-E+R_Zkz{&LzH7;lw&Tu94{j&
a^P11O-wVgYpfetHqJ9Qk7nu~ewgNwdQ59YQ
literal 0
HcmV?d00001
diff --git a/Marketplace/src/backend/.DS_Store b/Marketplace/src/backend/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6b78a73de5398625b6f6a783f12f785dd706c56d
GIT binary patch
literal 6148
zcmeHKISv9b477m)L_<lLFYtp1!3+2RSA|xhSV6rN@8W5Uj{>yNL4(GUGl}C#lquG0
z5z*!4xDc6%$QW)YHyiq9`{q3xWJG~*oN<swcG60FY<t=71IC@m39KvpiGOJJ=W}D*
zG%7#^r~nn90#x9O3S@B|PrrC3kD>xp;6D_w??Ztb*2FH*KOGpn1ptl^cEj9z31G1R
zuqJkah`=<cz@Tcj7#eiMOXk(YE->h#*?ef;tl6Qc-;VQ(r;FA=j#PjOyecq^<;?2;
z8vddGe<g861*pJZDWId(X0^nVvbOdfXSKG#w{Xk3!_6>v3I;F7KrhEwSUH}1Qsfnz
XW4|VLflf!<=|KJrm@YIb@M{Gg!4(yc
literal 0
HcmV?d00001
diff --git a/Marketplace/src/backend/javaclass/MarketplaceImpl.java b/Marketplace/src/backend/javaclass/MarketplaceImpl.java
index b23908a..37e3d1e 100644
--- a/Marketplace/src/backend/javaclass/MarketplaceImpl.java
+++ b/Marketplace/src/backend/javaclass/MarketplaceImpl.java
@@ -503,7 +503,7 @@ public class MarketplaceImpl implements Marketplace {
ps.close();
}
String sqlc = "SELECT COALESCE(COUNT(IdUser),0) AS Likes FROM ProductLikes WHERE IdpLiked ="+idproduct;
- System.out.println("id product gue:"+idproduct);
+
rs1 = stmt.executeQuery(sqlc);
rs1.next();
like = rs1.getInt("Likes");
diff --git a/SW/.DS_Store b/SW/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f58bd175ee13da2e798aa9e4d22889b38fe130b1
GIT binary patch
literal 6148
zcmeHKQA^`M5Z-O8ru8M_3BtYPRq!Etim$Qiqfm&n9H;cMCR`Unwlt|lN+Hkp;(t)@
z^nb|Rf4HCGn=`vx@o4Y$6qyM#-*k3nlYAR?JB%^j9L8IWxr{Lf6tPkVGe>Y7bw(;S
zQU&CC4#hH7uteLLbPBvd25{{ftOIK%*a3U7eqxmOMXCghKZ<@T^TPN4@Jh9|u(;&Z
z8_RgPD~+?Tr$%8B6~nw44Zi4KGERi`TT#)Q`X@@I&weD@G8uK<4+knMBAF$F7p12i
znZ;_<RKqOJPeU_bN5)03>#ns1$pw_QqAY34Tnd@W;?k+()pgg$<89yH^tSy^lTB~D
zw+H^t?$%`DUOCRkjotm@&;7~w>zmsjKkx1zewhW~@bPL{wK#>};LIf_&d*Z;uY-ki
z6E4C*ma6O<j87+@PD)4&5Cg=(>oZ_?CTIEeABCQP7$64T7z4OJc%X=Z#nPbOI>6`_
z0I&vOE#PA>fi<4Rz+!0-MnJeJ1vI7Hwiw)$L)^1@fyL6GDQDa^AKc!V+YW{6yTkmR
zPG>wYNR}8N2L5IMdp{5t&;O%;_y0PH3^70qyiW#r?JzuS!n@hCb>=Pcto1;@f}&tv
nY4EuO9DNi+E*{0}pjsgAp#vCLEDb^gg#HL<8psd>|CNC!;>>Ou
literal 0
HcmV?d00001
diff --git a/a/.classpath b/SW/.classpath
similarity index 89%
rename from a/.classpath
rename to SW/.classpath
index de28749..6000883 100644
--- a/a/.classpath
+++ b/SW/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_111">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0_66]">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
diff --git a/a/.project b/SW/.project
similarity index 98%
rename from a/.project
rename to SW/.project
index 10dc8c0..9966d6d 100644
--- a/a/.project
+++ b/SW/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>a</name>
+ <name>SW</name>
<comment></comment>
<projects>
</projects>
diff --git a/a/.settings/.jsdtscope b/SW/.settings/.jsdtscope
similarity index 100%
rename from a/.settings/.jsdtscope
rename to SW/.settings/.jsdtscope
diff --git a/a/.settings/org.eclipse.jdt.core.prefs b/SW/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from a/.settings/org.eclipse.jdt.core.prefs
rename to SW/.settings/org.eclipse.jdt.core.prefs
diff --git a/a/.settings/org.eclipse.wst.common.component b/SW/.settings/org.eclipse.wst.common.component
similarity index 77%
rename from a/.settings/org.eclipse.wst.common.component
rename to SW/.settings/org.eclipse.wst.common.component
index 9334fb6..f56a35e 100644
--- a/a/.settings/org.eclipse.wst.common.component
+++ b/SW/.settings/org.eclipse.wst.common.component
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="a">
+ <wb-module deploy-name="SW">
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<property name="context-root" value="/"/>
- <property name="java-output-path" value="/a/build/classes"/>
+ <property name="java-output-path" value="/SW/build/classes"/>
</wb-module>
</project-modules>
diff --git a/a/.settings/org.eclipse.wst.common.project.facet.core.xml b/SW/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from a/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to SW/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/SW/.settings/org.eclipse.wst.jsdt.ui.superType.container
similarity index 100%
rename from a/.settings/org.eclipse.wst.jsdt.ui.superType.container
rename to SW/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/SW/.settings/org.eclipse.wst.jsdt.ui.superType.name
similarity index 100%
rename from a/.settings/org.eclipse.wst.jsdt.ui.superType.name
rename to SW/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/a/WebContent/META-INF/MANIFEST.MF b/SW/WebContent/META-INF/MANIFEST.MF
similarity index 100%
rename from a/WebContent/META-INF/MANIFEST.MF
rename to SW/WebContent/META-INF/MANIFEST.MF
diff --git a/a/WebContent/firebase-messaging-sw.js b/SW/WebContent/firebase-messaging-sw.js
similarity index 100%
rename from a/WebContent/firebase-messaging-sw.js
rename to SW/WebContent/firebase-messaging-sw.js
diff --git a/a/WebContent/WEB-INF/web.xml b/a/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 6e2885d..0000000
--- a/a/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" id="WebApp_ID" version="3.1">
- <display-name>a</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
\ No newline at end of file
diff --git a/chatService/.DS_Store b/chatService/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I
literal 0
HcmV?d00001
diff --git a/chatService/.classpath b/chatService/.classpath
index 3d948f1..b0cc5ab 100644
--- a/chatService/.classpath
+++ b/chatService/.classpath
@@ -1,19 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_111">
+ <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0_66]">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v9.0">
+ <classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v9.0">
<attributes>
<attribute name="owner.project.facets" value="jst.web"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="lib" path="C:/Users/hp/Desktop/WBD/TugasBesar3_AngularJSandFirebase/JAR/json-simple-1.1.jar">
+ <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/CLEAN/JAR/json-simple-1.1.1.jar">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/CLEAN/JAR/javax.servlet-api-3.0.1.jar">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/CLEAN/JAR/javax.jws-3.1.2.2.jar">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/CLEAN/JAR/javax.ws.rs-api-2.0.jar">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="/Users/wahyudinakbar/Desktop/CLEAN/JAR/mysql-connector-java-5.0.8/mysql-connector-java-5.0.8-bin.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
diff --git a/chatService/.settings/org.eclipse.wst.common.project.facet.core.xml b/chatService/.settings/org.eclipse.wst.common.project.facet.core.xml
index 83f612f..bf8f8be 100644
--- a/chatService/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/chatService/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="Apache Tomcat v9.0"/>
- <fixed facet="jst.web"/>
- <fixed facet="java"/>
<fixed facet="wst.jsdt.web"/>
+ <fixed facet="java"/>
+ <fixed facet="jst.web"/>
<installed facet="java" version="1.8"/>
<installed facet="jst.web" version="3.1"/>
<installed facet="wst.jsdt.web" version="1.0"/>
diff --git a/chatService/build/classes/javachat/connectFB.class b/chatService/build/classes/javachat/connectFB.class
index e6b04931246c6afe8e23580f94d3c29f279149d5..5e3ea468a17c565d2ec32a3eb5f4e3f7d43c90f1 100644
GIT binary patch
delta 1534
zcmY*ZT~HfU6#j0q$!?ZKF;HNKD$te^LLpSCmEa$tT4*V)K%ptnHiT^m4ZDzRptLAj
zwPLH)_FAj;hx*gvzfx(K5yz_I&>0_`@x}4U@!cnNoKYXdvkUcScK7ag_nz~ebG~!$
zephg&Q2zR_Pd)=siz}z)@7Z?#gHXmL=B4LSNJ*!(WSbV%;-gx>gf$Ef(~ux~P=<05
z>ltzeBcqW(BBI9v?c*s^8&cpy1%uN_n+&U3__vPSx_S|n3<du&HIs2Y7D~qx{aR8&
z6@%CxF(W0x5*dC36nIcW-ah`bkSEK?!>tN#LoIJ|_#{7WSFjm(@WYP!B0qu(>QT!e
znMS+KD&sEPBjRrUjiYeOy%vu+Owr7QE+d33A{zgnwe6(fKHN_vG0hB(n_7xN@Ktn&
zJYZ<ze&+%906*#Uvv!_wR<PatN2jm2i$Sp~(ls-%yRAh=Cj!>6S3x&=c)3u+_VGPJ
zvDAwL3L@y^lR`mFKe;s;x~b`ARmb?SCgC9E6B!;(#G?^2Zs>u*ltHQXVn9J0gM3kF
z$V)I}H>Ax0BN;zp8%fZ4k*lV0m=fK!v%SNzPbx@R<>sU`vrQXGYbkSwMn3)4Vp_o{
zWYQvP=(-j)t#5}FjN=GD<qEV;;2{wYGUVA6#f`wuv^ktMNl`6AEuF-}46d<c+|=mp
z>kd_P%9y}01&>;!u4uwYX%^+<3XbCmp5?A$Px3l<QRPVn^*U#>{tsoF7NO3|IDx0F
zW}jjx^zl;nD#aq6!n4-L)BJ+Fuzm_$!E<(pDVP41xK4qla7@NIyeQ%YhTMPmRmVWm
z7>o2JGzI7J691Lbc!igWt3A_rO~eJV<)u=tQ^D)JNBoIh=1tQ1$zLEqq!Tc(fV}WL
z@`JAHz^%Hx1sgI@y9nG|wE~J&!A5RxY2^x7tGX<78S56{4|_Mvqgr)murY&88PsKP
zr+;PIa0OduDV75_(CCK@(zck2ErA!MD8d@7!&+3+xS7sa1J=`CDo2bC)s5uPw45k%
za1+faWi(?O?NJLA5^~sRJ0YiyN(c$Wz8@`c!$mPVv4fDCd|D~E13M``O&!>UHe><p
zH!`C)u6a9JSnC2h!`_a0?8zYfIeLSFDp2wJRlyteY8k``9P$n=10#bGOB&M}#)2-@
z<)6dW431jjJYs!(Ea+xIkp-m%OobP4BCNXS;eTo#&jdZHCxbKLpnPrVch$3qI%|G*
z1{;H-HI?isACYgFd|nl=lF;6lN!A(2R!SMXI!hJnw4IMr>ODA17pRa=aTU|FVu{^G
zzY(C4W>vHjMn3jpHK|)h_SLj?H(?)wbW9u2N2*0hnS-QOj8<dBJV4xsFo&T@BGvH)
z3@l>AZb}acOnR*}#fh)*1`*Jyz?XOv7b##qF41+7TG4=`n891L)=Bhl;~mmor)Iy4
z_lRYbY~LqenfP7!03VXaN5s7io+UDqMKH0Meqthe?R!GRtcY{=Jq2_T_!C(ndSz$-
X0ml*%36{^Yiv^~w&VNjl4$S=x78OkE
delta 1422
zcmYjR`%@cL6#j0qn@yIb)(C`9T0*65poGv`tt_=Iv?!&KP@YW#l{73g7?PAMw9sm3
zRjhB@D?VzmYPI;PRjkX5_#UUs_y;&nf6`y|XJ@M8h-U*h&g`81&b{Y;=brD}d(RjC
z<dT2<=ZmiaY{O^g<ex1yUT$Y)yog;{Wzmy%NDkbI4HC-uFD&1>5u5le<`K#nT>LAG
z%Vo!A2B|NiM?9)Wh8I2s4pi|bOR=q5!4_=gaf{dP#Wn?Z;~sv|Qrqaoy$WiumBFqj
z+w|dBVn9YM?vt>C;f}$`Xv7~&`desRr&%pBq+lniC{4;7iYH|3M!keOUSiEJ+Jn8s
zGob19W4e}R5WMB#dIuQp=grn$7Ub8g73=`NX)R}MToAk^9Slk~M?%y69jyTw?eLlA
zpn?z%@%=(I>*l9~l3*Bz6+DDqhMcsf?@b0r^wfxMrZ`mIX~z*F+LKJ^T0-}=kEJv_
z`WRM6QmJ?>8qs6Pgnuxdq|JuWuV4U2`ENp9-XKG6-H3iPIUF0$2H6qkyToc|f_Phk
zZS7`!O2IMG@U)m;97bA!4w<TtCKCxQs+$3$3XbChpB4Sh<2WVZBtzbcZcDpd5$+K@
z${-#ej_Dfxz2W-uP8s8vP;lBL6{GQFS~DphQ}8&R;C`ErJ;{4)YuHnK%(l*c7SEUs
zeU@Lct=&C|=S}AY>XJ9GlCM>Z^l8JjChsK9DL9{PEVZpK5K9pCBqn4`;S~ul^S^C{
z)>rWwcS*h-uhS7~)b*6dtlBfI9UIZox+hI)mdcpMB?)i*?=<WSHk^oRDN|MjZ}JK0
zclHU7+b?8pLV%5q@8Nmmh2~J83M)W#3r<(10e2UHwZ1G6oh6%>L8)6X(Ja=_!y9r|
z%%RdP8t@yq%fNO6YQ?g<>vJ@GN*OFzMRp?z0F;pRz=_ff)?hu#=#KcvZpQ{3ppYJH
z!fh0`b7^Z>joZniP2vGG(%CdoAt6f^?IUC*!VWZ1yg;-8>?b5rWB@WnJxFmj`ZuEm
zIRN{E=ID<FXQnm4n&;6Ta<<N)(?Hj^2&;lypxSz<?1(dJKqC-yKD-2m3?$9UhfOo0
zif*yuIvNa&nbl^@!859jsS;D|^Oy|H<7~)no5Ry{cusY=9R^+usq(_&Ew|$aYTOQ|
z0X~B*s$}|hbDs07^16bT+|oBBt@8p2IRn|;l7Wl-SGg!NO~sl@wjz&g1$mWJ&OsE=
z^()39k}!-abklRu0~NifLxhAmf*>?>qMv5^k)R7ThCy6M9A9Dx-_ghoq_U!SXFIg8
zEV>mx;H|9aBEHAlxSXMc1-OEDaGA8O!%4hLo|vVc!F!~0f;#y=J|LP=iv5rl%alOG
zN4QEWKBi4K!LdkTvIHj4V<aJ*{l+C+lQ5P2CV?&je<6pSs;S)EKVexU9zk;dx5fn1
LHfr+H>6-l)EJ`xO
diff --git a/chatService/build/classes/javachat/sendMessage.class b/chatService/build/classes/javachat/sendMessage.class
index c2e1aacade695e24a262dd506dd404f25c5736f7..d7534230e7019ca8db6738f1ac1f976130812b6d 100644
GIT binary patch
delta 427
zcmXAlxk`gk5QWdVV^;lLVoZ!7Ac7z&f~6?}8gL=*iA&sf1u<@@kR}!)VgeF>6<d7*
z<rm+;hp-Z{RIIG5yom$De9UkU=boRAv+%>C!I+tHH<}MNk8ZE^Y24aeeXzq1NY2bv
zzcX#6yc0?VT;_{!#)wE%y4fSeX|?$cW+FJ3D6-OvoFtK#C0t4hrX1l)GPssg+(;I8
z@B-{YeL)yC@Ija47-K(JqyY{>!6_#k;xGh$Ip7FKQGz<zW1I=t5Q2ka9M=Y0W#OMP
z=s^`HI0*+<q=`v=cHjvuoZ>W`_*R>^&^sr7)jaZ=T(qk=OigaO)evVil`^7&oaG$K
z*r{rZZw<cknDbmfIX`&FMJ}O&U)<s{S5T?QNv<+Dj4EYgf@@mFqZ-h~b#9<qrSWDa
z0`2WhOmQ1toln8$4r+8l&D_=haq4^w9B@xt+ShUTpbGNVbKsE-nfbb~bsrq%A2WhZ
A$^ZZW
delta 426
zcmXAlODn`-6vm(DJ;sdT?>d)eCM89}W|ky1lgz?>T*hVG?~%Kba!D2pC0=Bud;|K+
zhp@4>u#l~+td#Q3IGgk9oX*p8o}>Ejy88!<b$ZENq3<0Y``5a0<iwB-KOiZ6Tk_5=
zd*72#`qh`T8YCi3j7g^3QNP8#2Bai{6KTe&BycWcxR6C?*~F#n;7Sg0EyuWn2VfLs
zX;paPgDFX|g{@$Q+Sm>SmmIKzoe=nCon4G03qe_7H+$efDV*$OpK(_!BmcCA7>bx+
zKb)A7N)DK{6OX9jAcx?>mzu|!nYr+zhH-8vhuNwN+K`)W)yAZuTsEozhdF{gMwBme
zYw?x49OW4D`N0j2a{>kY<N_x-g+fL4ahjn{6e$PeoG~)RsvJ?yat<YG8*h3p5Dr&z
ziOcYqe9|^o;57+VbJhIgGWl58<eIUxZsPDkrRDACzyl=&uMP*R^h>bNehS6;2Y@wB
As{jB1
diff --git a/chatService/src/javachat/connectFB.java b/chatService/src/javachat/connectFB.java
index df2b190..1c08aa2 100644
--- a/chatService/src/javachat/connectFB.java
+++ b/chatService/src/javachat/connectFB.java
@@ -26,12 +26,13 @@ public class connectFB {
private JSONObject processData;
private byte[] data;
- public void setData (String token, String message, String userSend) {
+ public void setData (String token, String message, String userSend, String userReceived) {
/**Create new JSON message**/
JSONObject jsonMessage = new JSONObject();
JSONObject jsonBody = new JSONObject();
jsonMessage.put("message", message);
jsonMessage.put("senderName", userSend);
+ jsonMessage.put("userReceived", userReceived);
jsonBody.put("to", token);
jsonBody.put("data", jsonMessage);
System.out.println("data : " + jsonBody.toJSONString());
diff --git a/chatService/src/javachat/sendMessage.java b/chatService/src/javachat/sendMessage.java
index 7cf613b..dbf80db 100644
--- a/chatService/src/javachat/sendMessage.java
+++ b/chatService/src/javachat/sendMessage.java
@@ -133,7 +133,7 @@ public class sendMessage extends HttpServlet {
/**Send Message to FCM*/
connectFB sendFB = new connectFB();
- sendFB.setData(tokenReceived, message, userSend);
+ sendFB.setData(tokenReceived, message, userSend, userReceived);
try {
sendFB.sendData();
} catch (ParseException | UnsupportedEncodingException ex) {
--
GitLab