diff --git a/ChatService/src/java/org/ChatService/SendMessage.java b/ChatService/src/java/org/ChatService/SendMessage.java
index a069dc565488149beb500ba6ff58ecc66bc914bd..e146d1537b9d593d1aa8cae392fe1ba78f8d74e2 100644
--- a/ChatService/src/java/org/ChatService/SendMessage.java
+++ b/ChatService/src/java/org/ChatService/SendMessage.java
@@ -5,7 +5,10 @@
  */
 package org.ChatService;
 
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -52,16 +55,42 @@ public class SendMessage extends HttpServlet {
                 ResultSet rs = stmt.executeQuery(sql);
                 if(rs.next()){
                     JSONObject json = new JSONObject();
+                    JSONObject json1 = new JSONObject();
                     String chattoken =rs.getString("chattoken");
+                    /* Format json
+                    {data : {
+                        username : xx
+                        message : xx
+                    },
+                    to : xx 
+                    }*/
                     json.put("to", chattoken);
-                    json.put("username",username);
-                    json.put("message",message);
+                    json1.put("username",username);
+                    json1.put("message",message);
+                    json.put("data",json1);
                     String url = "https://fcm.googleapis.com/fcm/send";
                     URL obj = new URL(url);
                     HttpURLConnection con = (HttpURLConnection) obj.openConnection();
                     con.setRequestMethod("POST");
                     con.setRequestProperty("Content-Type","application/json");
-                    con.setRequestProperty("Authorization","key:");
+                    con.setRequestProperty("Authorization","key:AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU");
+                    DataOutputStream wr = new DataOutputStream(con.getOutputStream());
+                    String urlParameters = json.toString();
+                    wr.writeBytes(urlParameters);
+                    wr.flush();
+                    wr.close();
+                    con.setReadTimeout(15*1000);
+                    con.connect();
+                    /* OutputStreamWriter outputWriter = new OutputStreamWriter(con.getOutputStream());
+                    outputWriter.write(urlParameters);
+                    outputWriter.flush(); */
+
+                    BufferedReader br = new BufferedReader(new InputStreamReader((con.getInputStream())));
+                    StringBuilder sb = new StringBuilder();
+                    String output;
+                    while ((output = br.readLine()) != null) {
+                        sb.append(output);
+                    }
                 }
                 
                 /* format 
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 2d51f58022e2e6575fb5c867ed9b7aea3f625752..0764e61bca3ad7615aa56734c4f6f4559828ffa2 100644
Binary files a/IdentService/build/web/WEB-INF/classes/org/IdentService/DBAccount.class and b/IdentService/build/web/WEB-INF/classes/org/IdentService/DBAccount.class differ
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 5506ddb1ff96612a3cb5f901bd4996b8337964e6..3f6f8b0e82ff50274ff1c47c3ed74bd3fab0ef16 100644
Binary files a/IdentService/build/web/WEB-INF/classes/org/IdentService/RandomString.class and b/IdentService/build/web/WEB-INF/classes/org/IdentService/RandomString.class differ
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 00759848580227861e21adb044b6428eb105f057..363e8d3f625a49d4ad347359a16503cb7b9ac163 100644
Binary files a/IdentService/build/web/WEB-INF/classes/org/IdentService/RetrieveAccount.class and b/IdentService/build/web/WEB-INF/classes/org/IdentService/RetrieveAccount.class differ
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 31a29c2b45db8fb6cd6627bb6dc3d8408455a93b..bfcfc2c393b65178e3fa12c901b8895ff41a854a 100644
Binary files a/IdentService/build/web/WEB-INF/classes/org/IdentService/login.class and b/IdentService/build/web/WEB-INF/classes/org/IdentService/login.class differ
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 605a3c2578231d0e68c006d05d8c2501c9690e22..1279c9f4eb69f01bf2b805ae125f037bb43fc34f 100644
Binary files a/IdentService/build/web/WEB-INF/classes/org/IdentService/logout.class and b/IdentService/build/web/WEB-INF/classes/org/IdentService/logout.class differ
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 7a2a9b0ce89fc92347cd547e313812f040103aa9..1c9ea990b8b887fbabe00a9f33084292e6fe3064 100644
Binary files a/IdentService/build/web/WEB-INF/classes/org/IdentService/register.class and b/IdentService/build/web/WEB-INF/classes/org/IdentService/register.class differ
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 770d8afa50006255f648df8999e1dcf8da558022..b76da22615b7a5da6be2a7101b4ef392fa87479d 100644
Binary files a/IdentService/build/web/WEB-INF/classes/org/IdentService/tesKoneksi.class and b/IdentService/build/web/WEB-INF/classes/org/IdentService/tesKoneksi.class differ
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 87e9b798eab2e001df559730747abf378617e749..491a2d9d5b60658adf66c9bcad4c0a8a171a69b0 100644
Binary files a/IdentService/build/web/WEB-INF/classes/org/IdentService/validate.class and b/IdentService/build/web/WEB-INF/classes/org/IdentService/validate.class differ
diff --git a/IdentService/build/web/gfv3ee6.dpf b/IdentService/build/web/gfv3ee6.dpf
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/IdentService/nbproject/ant-deploy.xml b/IdentService/nbproject/ant-deploy.xml
index 5d33e0d6e743ce97b9b63e4c37346ab71071ce70..2d5f8778d18757ea5ded4eea4da13ca1adc51093 100644
--- a/IdentService/nbproject/ant-deploy.xml
+++ b/IdentService/nbproject/ant-deploy.xml
@@ -1,43 +1,4 @@
 <?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}" />
@@ -47,7 +8,7 @@ Contributor(s):
         <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 17b05e1fd355984e3470323a00669e8abef06ddb..0f610372d1078b944a0531ab173b5f245cad22ab 100644
--- a/IdentService/nbproject/private/private.properties
+++ b/IdentService/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=/home/khrs/.netbeans/8.2/config/GlassFishEE6/Properties/gfv3-2049786751.properties
+deploy.ant.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv3-445781616.properties
 j2ee.platform.is.jsr109=true
-j2ee.server.domain=/home/khrs/glassfish-4.1.1/glassfish/domains/domain1
-j2ee.server.home=/home/khrs/glassfish-4.1.1/glassfish
-j2ee.server.instance=[/home/khrs/glassfish-4.1.1/glassfish:/home/khrs/glassfish-4.1.1/glassfish/domains/domain1]deployer:gfv3ee6wc:localhost:4848
-j2ee.server.middleware=/home/khrs/glassfish-4.1.1
-user.properties.file=/home/khrs/.netbeans/8.2/build.properties
+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
diff --git a/IdentService/nbproject/private/private.xml b/IdentService/nbproject/private/private.xml
index 72719abb3b793db2b834653a9fa6afaa5913e7ea..737acd08411867f1af5532a10da85219d8e8554f 100644
--- a/IdentService/nbproject/private/private.xml
+++ b/IdentService/nbproject/private/private.xml
@@ -3,7 +3,7 @@
     <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:/home/khrs/GitProject/WBD/Tubes3/TugasBesar3_AngularJSandFirebase/IdentService/src/java/org/IdentService/DBAccount.java</file>
+            <file>file:/D:/Kuliah/IF%20ITB/Semester%205/Web%20Based%20Development/TugasBesar3_AngularJSandFirebase/IdentService/src/java/org/IdentService/login.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/IdentService/nbproject/project.properties b/IdentService/nbproject/project.properties
index f084e36d96884511d0b0586d1bb4541af6146a50..c1341e3b63172ef6e8419c9b316bfdc5e3c2102f 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/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
 j2ee.platform.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 8d8af3f34616c446e678a0054ccd5d4146491086..330d031495f4e3425cb0c01fbf0ba64df7d89f75 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/NewServlet.class and b/KAA-JSP/build/web/WEB-INF/classes/NewServlet.class differ
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 6391415a9a3126e57cac65ed19b2fd2bb5f1ae8f..63ea6d742b8cd6f38440397c3d3fa52ec82cef67 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/MarketPlaceService_Service.class and b/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/MarketPlaceService_Service.class differ
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 41d17d8318cb2f3e7eccc17b4666edbf7770d296..ba37c6e8645c1a52c3a0270ffa9adddd806ae5e1 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/DB.class and b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/DB.class differ
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 7291845d20e5252c346e689d6d83c25f22edce8c..0533d036109652331155f580b3751e4acfa4b4a6 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/RestAPI_consumer.class and b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/RestAPI_consumer.class differ
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 5c1b5dbe661eee7d43f7d4ea91d1d25abf4f4c2a..a5856c7893cda609d34e7485d240e7fd97b10506 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/UploadProduct.class and b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/UploadProduct.class differ
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 e9947b4f2d90b0b0d65f91b5576095848d3b067e..6e50e3a5a8bca4fa92971654320dcc93e699139e 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/tokenParser.class and b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/tokenParser.class differ
diff --git a/KAA-JSP/build/web/WEB-INF/sun-web.xml b/KAA-JSP/build/web/WEB-INF/sun-web.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1ac7af40bc9f499787d5623c4191ae84b07f4c3b
--- /dev/null
+++ b/KAA-JSP/build/web/WEB-INF/sun-web.xml
@@ -0,0 +1,11 @@
+<?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/login.jsp b/KAA-JSP/build/web/login.jsp
index 147cfb2c5d21e6a464f6dc0fb1a99bb5ae025159..1608f21decb24f5663e34f9c8809625e2581f3e8 100644
--- a/KAA-JSP/build/web/login.jsp
+++ b/KAA-JSP/build/web/login.jsp
@@ -124,5 +124,15 @@
             })
             */
         </script>
+        <%
+            JSONObject json2 = new JSONObject();
+            JSONObject json1 = new JSONObject();
+            //String chattoken =rs.getString("chattoken");
+            json2.put("to", "XXX");
+            json2.put("username","Ali");
+            json1.put("message","Masbro");
+            json2.put("data",json1);
+            System.out.println(json2.toString());
+        %>
     </body>
 </html>
diff --git a/KAA-JSP/build/web/scripts/app.js b/KAA-JSP/build/web/scripts/app.js
index af549782358f07e6f0eb0081ec601e7c2334a27c..3698a5f52fe5e47b4f2527562c85a5932228f51c 100644
--- a/KAA-JSP/build/web/scripts/app.js
+++ b/KAA-JSP/build/web/scripts/app.js
@@ -39,7 +39,7 @@ app.controller('chatController', ['$scope','Message', function($scope,Message){
     };
     firebase.initializeApp(config);
           
-    const messaging = firebase.messaging();
+    messaging = firebase.messaging();
     messaging.requestPermission()
       .then(function() {
         console.log('Notification permission granted.');
diff --git a/KAA-JSP/nbproject/ant-deploy.xml b/KAA-JSP/nbproject/ant-deploy.xml
index 5d33e0d6e743ce97b9b63e4c37346ab71071ce70..2d5f8778d18757ea5ded4eea4da13ca1adc51093 100644
--- a/KAA-JSP/nbproject/ant-deploy.xml
+++ b/KAA-JSP/nbproject/ant-deploy.xml
@@ -1,43 +1,4 @@
 <?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}" />
@@ -47,7 +8,7 @@ Contributor(s):
         <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 17b05e1fd355984e3470323a00669e8abef06ddb..0f610372d1078b944a0531ab173b5f245cad22ab 100644
--- a/KAA-JSP/nbproject/private/private.properties
+++ b/KAA-JSP/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=/home/khrs/.netbeans/8.2/config/GlassFishEE6/Properties/gfv3-2049786751.properties
+deploy.ant.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv3-445781616.properties
 j2ee.platform.is.jsr109=true
-j2ee.server.domain=/home/khrs/glassfish-4.1.1/glassfish/domains/domain1
-j2ee.server.home=/home/khrs/glassfish-4.1.1/glassfish
-j2ee.server.instance=[/home/khrs/glassfish-4.1.1/glassfish:/home/khrs/glassfish-4.1.1/glassfish/domains/domain1]deployer:gfv3ee6wc:localhost:4848
-j2ee.server.middleware=/home/khrs/glassfish-4.1.1
-user.properties.file=/home/khrs/.netbeans/8.2/build.properties
+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
diff --git a/KAA-JSP/nbproject/private/private.xml b/KAA-JSP/nbproject/private/private.xml
index bc5dd1836885447d862b7a5fc7fffc305ec99cd2..76c5a8eb4b713af41da794d7c6690e0d936df80f 100644
--- a/KAA-JSP/nbproject/private/private.xml
+++ b/KAA-JSP/nbproject/private/private.xml
@@ -3,13 +3,12 @@
     <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:/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/web/login.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/web/catalog.jsp</file>
-            <file>file:/home/khrs/GitProject/WBD/Tubes3/TugasBesar3_AngularJSandFirebase/KAA-JSP/src/java/org/saleproject/KAA/RestAPI_consumer.java</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/scripts/chat.js</file>
+            <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>
         </group>
     </open-files>
 </project-private>
diff --git a/KAA-JSP/nbproject/project.properties b/KAA-JSP/nbproject/project.properties
index c2d6fb21fb1de80301fbd6a3afce6cbe7cb827d2..9ad84afc728c9ad334bd0d52aec05d007a024e47 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/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
 j2ee.platform.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/login.jsp b/KAA-JSP/web/login.jsp
index 147cfb2c5d21e6a464f6dc0fb1a99bb5ae025159..1608f21decb24f5663e34f9c8809625e2581f3e8 100644
--- a/KAA-JSP/web/login.jsp
+++ b/KAA-JSP/web/login.jsp
@@ -124,5 +124,15 @@
             })
             */
         </script>
+        <%
+            JSONObject json2 = new JSONObject();
+            JSONObject json1 = new JSONObject();
+            //String chattoken =rs.getString("chattoken");
+            json2.put("to", "XXX");
+            json2.put("username","Ali");
+            json1.put("message","Masbro");
+            json2.put("data",json1);
+            System.out.println(json2.toString());
+        %>
     </body>
 </html>
diff --git a/KAA-JSP/web/scripts/app.js b/KAA-JSP/web/scripts/app.js
index af549782358f07e6f0eb0081ec601e7c2334a27c..3698a5f52fe5e47b4f2527562c85a5932228f51c 100644
--- a/KAA-JSP/web/scripts/app.js
+++ b/KAA-JSP/web/scripts/app.js
@@ -39,7 +39,7 @@ app.controller('chatController', ['$scope','Message', function($scope,Message){
     };
     firebase.initializeApp(config);
           
-    const messaging = firebase.messaging();
+    messaging = firebase.messaging();
     messaging.requestPermission()
       .then(function() {
         console.log('Notification permission granted.');
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 2d4880d136a4e116e5424a53b14b97ade5d088bf..1e0163cfd7fc25fe3a7ba026e6a2ad1fafa47b04 100644
Binary files a/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/DBMarketPlace.class and b/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/DBMarketPlace.class differ
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 48d8c8e04f624d9512af5aeffffbf4b026bc41ed..ad801dc36eb26f8f17ef07d1e3213a372bd7674a 100644
Binary files a/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/MarketPlaceService.class and b/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/MarketPlaceService.class differ
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 bcefd2a8bd2f3a3f6c2f44d578c8417b01f2de43..9b8c42de6e80e91a83df10f66f7bb24c96ece632 100644
Binary files a/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/RestAPI_consumer.class and b/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/RestAPI_consumer.class differ
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 e8bacc4e46587a9912d84eb96a9f827573449254..b45e5d5e0a07b9fa16925044c1a3c44093b4f789 100644
Binary files a/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/Validator.class and b/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/Validator.class differ
diff --git a/MarketPlaceService/nbproject/ant-deploy.xml b/MarketPlaceService/nbproject/ant-deploy.xml
index 5d33e0d6e743ce97b9b63e4c37346ab71071ce70..2d5f8778d18757ea5ded4eea4da13ca1adc51093 100644
--- a/MarketPlaceService/nbproject/ant-deploy.xml
+++ b/MarketPlaceService/nbproject/ant-deploy.xml
@@ -1,43 +1,4 @@
 <?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}" />
@@ -47,7 +8,7 @@ Contributor(s):
         <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 17b05e1fd355984e3470323a00669e8abef06ddb..0f610372d1078b944a0531ab173b5f245cad22ab 100644
--- a/MarketPlaceService/nbproject/private/private.properties
+++ b/MarketPlaceService/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=/home/khrs/.netbeans/8.2/config/GlassFishEE6/Properties/gfv3-2049786751.properties
+deploy.ant.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv3-445781616.properties
 j2ee.platform.is.jsr109=true
-j2ee.server.domain=/home/khrs/glassfish-4.1.1/glassfish/domains/domain1
-j2ee.server.home=/home/khrs/glassfish-4.1.1/glassfish
-j2ee.server.instance=[/home/khrs/glassfish-4.1.1/glassfish:/home/khrs/glassfish-4.1.1/glassfish/domains/domain1]deployer:gfv3ee6wc:localhost:4848
-j2ee.server.middleware=/home/khrs/glassfish-4.1.1
-user.properties.file=/home/khrs/.netbeans/8.2/build.properties
+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
diff --git a/MarketPlaceService/nbproject/project.properties b/MarketPlaceService/nbproject/project.properties
index ea23c6106caaa611bfc917f77288b85cf0fb7116..d31fdb74d8de159727fd0eb73b2b9a9def201a00 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/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
 j2ee.platform.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