diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/DBAccount.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/DBAccount.class
index 0764e61bca3ad7615aa56734c4f6f4559828ffa2..2d51f58022e2e6575fb5c867ed9b7aea3f625752 100644
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 3f6f8b0e82ff50274ff1c47c3ed74bd3fab0ef16..5506ddb1ff96612a3cb5f901bd4996b8337964e6 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 363e8d3f625a49d4ad347359a16503cb7b9ac163..00759848580227861e21adb044b6428eb105f057 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 4bff7d5e3e6e7aa58fa413b5f7b8e0205739e2db..01827fff713311155c8add268b57017638e4ba7f 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 8b95b90309a2ccc042402b7db83fb16bf70fe44f..ccfd5e751d219473a8f2b67866bab4cb123998c6 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 81841715b74c9bc723f5e0f27e21b1c569d427d7..89d6cedc71b6ff4513b6dd573382bf496a3ea9fa 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 b76da22615b7a5da6be2a7101b4ef392fa87479d..770d8afa50006255f648df8999e1dcf8da558022 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 491a2d9d5b60658adf66c9bcad4c0a8a171a69b0..87e9b798eab2e001df559730747abf378617e749 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/dist/IdentService.war b/IdentService/dist/IdentService.war
index 6c77fc900fa8231d6cebbe1cb121b47fa9163203..25c4485aefa7fbce7fb4ada7340ceb87ae91dfe2 100644
Binary files a/IdentService/dist/IdentService.war and b/IdentService/dist/IdentService.war differ
diff --git a/IdentService/nbproject/ant-deploy.xml b/IdentService/nbproject/ant-deploy.xml
index 2d5f8778d18757ea5ded4eea4da13ca1adc51093..5d33e0d6e743ce97b9b63e4c37346ab71071ce70 100644
--- a/IdentService/nbproject/ant-deploy.xml
+++ b/IdentService/nbproject/ant-deploy.xml
@@ -1,4 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License. When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+
+Contributor(s):
+-->
<project default="-deploy-ant" basedir=".">
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
@@ -8,7 +47,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
diff --git a/IdentService/nbproject/private/private.properties b/IdentService/nbproject/private/private.properties
index 10d9cc55fe325b4f8f134543f4570bd9a75066db..28552d4ee798943351d4484319b203bb00c39ea6 100644
--- a/IdentService/nbproject/private/private.properties
+++ b/IdentService/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv3-445781616.properties
+deploy.ant.properties.file=C:\\Users\\Frys\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31137312071.properties
j2ee.platform.is.jsr109=true
-j2ee.server.domain=C:/Users/Ali-pc/AppData/Roaming/NetBeans/8.0.2/config/GF_4.1/domain1
-j2ee.server.home=C:/Program Files/glassfish-4.1/glassfish
-j2ee.server.instance=[C:\\Program Files\\glassfish-4.1\\glassfish;C:\\Program Files\\glassfish-4.1\\glassfish\\domains\\domain1]deployer:gfv3ee6:localhost:4848
-j2ee.server.middleware=C:/Program Files/glassfish-4.1
+j2ee.server.domain=C:/Users/Frys/GlassFish_Server/glassfish/domains/domain-client
+j2ee.server.home=C:/Users/Frys/GlassFish_Server/glassfish
+j2ee.server.instance=[C:\\Users\\Frys\\GlassFish_Server\\glassfish;C:\\Users\\Frys\\GlassFish_Server\\glassfish\\domains\\domain-client]deployer:gfv3ee6wc:localhost:4848
+j2ee.server.middleware=C:/Users/Frys/GlassFish_Server
user.properties.file=/home/khrs/.netbeans/8.2/build.properties
diff --git a/IdentService/nbproject/project.properties b/IdentService/nbproject/project.properties
index ee4fa46d92455598412a8b99150b5ea6663c9f3a..a0430600ebb76a4a8491598571e99105f567a528 100644
--- a/IdentService/nbproject/project.properties
+++ b/IdentService/nbproject/project.properties
@@ -41,8 +41,8 @@ j2ee.platform=1.7-web
=======
>>>>>>> bcf1435806005cb1ed3347eeb593de560332f805
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
diff --git a/KAA-JSP/build/web/WEB-INF/classes/NewServlet.class b/KAA-JSP/build/web/WEB-INF/classes/NewServlet.class
index 330d031495f4e3425cb0c01fbf0ba64df7d89f75..8d8af3f34616c446e678a0054ccd5d4146491086 100644
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 63ea6d742b8cd6f38440397c3d3fa52ec82cef67..6391415a9a3126e57cac65ed19b2fd2bb5f1ae8f 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 ba37c6e8645c1a52c3a0270ffa9adddd806ae5e1..41d17d8318cb2f3e7eccc17b4666edbf7770d296 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 3434d5267af03308bd4d58eb37277222426b0842..0fc54e936998594888fada1b6717022a5edfddc5 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 a5856c7893cda609d34e7485d240e7fd97b10506..5c1b5dbe661eee7d43f7d4ea91d1d25abf4f4c2a 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 a0130494cc1ec901acfdcb72b58e81e9d8519dbc..616683539244637a7013eecf109e7a46c248a286 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/catalog.jsp b/KAA-JSP/build/web/catalog.jsp
index b8adfec7c8163bb15f8688b4358324062ebb8754..bb83ad564c5ded0e6a7a2b0211f6dca3e31b984e 100644
--- a/KAA-JSP/build/web/catalog.jsp
+++ b/KAA-JSP/build/web/catalog.jsp
@@ -42,7 +42,24 @@
<!--Application -->
<script src="scripts/app.js"></script>
-
+ <script type="text/javascript">
+ // Fungsi AJAX untuk memproses likes (tambah, kurang, atau tampilkan)
+ function getState(username, product_id) {
+ var xmlhttp = new XMLHttpRequest();
+ xmlhttp.onreadystatechange = function () {
+ if (this.readyState == 4 && this.status == 200) {
+ var obj = JSON.parse(this.responseText);
+ if (obj.status === 'ON') {
+ document.getElementById("status" + username + product_id).innerHTML = "<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/on.png\">";
+ } else {
+ document.getElementById("status" + username + product_id).innerHTML = "<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/off.png\">";
+ }
+ }
+ };
+ xmlhttp.open("GET", "http://localhost:8080/ChatService/RetrieveStatus?username=" + username, true);
+ xmlhttp.send();
+ };
+ </script>
</head>
<body ng-app="chatApp" ng-controller="chatController">
@@ -246,18 +263,10 @@
out.print("<p>No product to be sold.</p>");
} else {
for (int i = 0; i < result.size(); i++) {
- urlParamChat = "username=" + result.get(i).getUsername();
- RestAPI_consumer consumer2 = new RestAPI_consumer(urlRequest2, urlParamChat);
- consumer2.execute();
- responseJSON = consumer2.getOutput();
- if (responseJSON.get("status").equals("ON")) {
- out.print("<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/on.png\">");
- out.print("<a href=\"\"><div ng-click=\"setReceiver('" + result.get(i).getUsername() + "')\"><p><b>" + result.get(i).getUsername() + "</a></b><br/>");
- } else {
- out.print("<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/off.png\">");
- out.print("<a href=\"\"><div ng-click=\"setReceiver('" + result.get(i).getUsername() + "')\"><p><b>" + result.get(i).getUsername() + "</a></b><br/>");
- }
- out.print("added this on " + result.get(i).getDate().getDate() + "</p></div>");
+ out.print("<script>setInterval(function(){ getState('" + result.get(i).getUsername() + "','" + result.get(i).getProductId() + "'); }, 1000);</script>");
+ out.print("<div id=\"status" + result.get(i).getUsername() + result.get(i).getProductId() +"\"></div>");
+ out.print("<a href=\"\"><div ng-click=\"setReceiver('" + result.get(i).getUsername() + "')\"><p><b>" + result.get(i).getUsername() + "</a></b><br/></div>");
+ out.print("added this on " + result.get(i).getDate().getDate() + "</p>");
out.print("<hr/>");
out.print("<table>");
out.print("<tr class = \"container\">");
@@ -341,7 +350,7 @@
}
}
%>
-
+
{{user}}
<br>
<div class="popup-box chat-popup" id="1" ng-show="isReceiverSet()" style="right: 0px; display: block;">
@@ -351,7 +360,7 @@
<div style="clear: both"></div>
</div>
<div class="popup-messages">
-
+
<li ng-repeat="message in messages" style="list-style-type:none">
<div ng-if="(message.name === receiver) && (message.to === user)" class="talk-bubble tri-right left-top">
<div class="talktext">
diff --git a/KAA-JSP/dist/KAA-JSP.war b/KAA-JSP/dist/KAA-JSP.war
index 5b796704304f25654bc513b4eecbbde91f91772b..f6c37564ec486e1979698a7128ab7df399bdde62 100644
Binary files a/KAA-JSP/dist/KAA-JSP.war and b/KAA-JSP/dist/KAA-JSP.war differ
diff --git a/KAA-JSP/nbproject/ant-deploy.xml b/KAA-JSP/nbproject/ant-deploy.xml
index 2d5f8778d18757ea5ded4eea4da13ca1adc51093..5d33e0d6e743ce97b9b63e4c37346ab71071ce70 100644
--- a/KAA-JSP/nbproject/ant-deploy.xml
+++ b/KAA-JSP/nbproject/ant-deploy.xml
@@ -1,4 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License. When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+
+Contributor(s):
+-->
<project default="-deploy-ant" basedir=".">
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
@@ -8,7 +47,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
diff --git a/KAA-JSP/nbproject/private/private.properties b/KAA-JSP/nbproject/private/private.properties
index 10d9cc55fe325b4f8f134543f4570bd9a75066db..28552d4ee798943351d4484319b203bb00c39ea6 100644
--- a/KAA-JSP/nbproject/private/private.properties
+++ b/KAA-JSP/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv3-445781616.properties
+deploy.ant.properties.file=C:\\Users\\Frys\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31137312071.properties
j2ee.platform.is.jsr109=true
-j2ee.server.domain=C:/Users/Ali-pc/AppData/Roaming/NetBeans/8.0.2/config/GF_4.1/domain1
-j2ee.server.home=C:/Program Files/glassfish-4.1/glassfish
-j2ee.server.instance=[C:\\Program Files\\glassfish-4.1\\glassfish;C:\\Program Files\\glassfish-4.1\\glassfish\\domains\\domain1]deployer:gfv3ee6:localhost:4848
-j2ee.server.middleware=C:/Program Files/glassfish-4.1
+j2ee.server.domain=C:/Users/Frys/GlassFish_Server/glassfish/domains/domain-client
+j2ee.server.home=C:/Users/Frys/GlassFish_Server/glassfish
+j2ee.server.instance=[C:\\Users\\Frys\\GlassFish_Server\\glassfish;C:\\Users\\Frys\\GlassFish_Server\\glassfish\\domains\\domain-client]deployer:gfv3ee6wc:localhost:4848
+j2ee.server.middleware=C:/Users/Frys/GlassFish_Server
user.properties.file=/home/khrs/.netbeans/8.2/build.properties
diff --git a/KAA-JSP/nbproject/project.properties b/KAA-JSP/nbproject/project.properties
index c43f872fdcbf70ff24cf7efec2e48b0517229ea7..3867ee90e62678d5db9ce6a9f680cd49fa662d5c 100644
--- a/KAA-JSP/nbproject/project.properties
+++ b/KAA-JSP/nbproject/project.properties
@@ -41,8 +41,8 @@ j2ee.platform=1.7-web
=======
>>>>>>> bcf1435806005cb1ed3347eeb593de560332f805
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
diff --git a/KAA-JSP/web/catalog.jsp b/KAA-JSP/web/catalog.jsp
index b8adfec7c8163bb15f8688b4358324062ebb8754..bb83ad564c5ded0e6a7a2b0211f6dca3e31b984e 100644
--- a/KAA-JSP/web/catalog.jsp
+++ b/KAA-JSP/web/catalog.jsp
@@ -42,7 +42,24 @@
<!--Application -->
<script src="scripts/app.js"></script>
-
+ <script type="text/javascript">
+ // Fungsi AJAX untuk memproses likes (tambah, kurang, atau tampilkan)
+ function getState(username, product_id) {
+ var xmlhttp = new XMLHttpRequest();
+ xmlhttp.onreadystatechange = function () {
+ if (this.readyState == 4 && this.status == 200) {
+ var obj = JSON.parse(this.responseText);
+ if (obj.status === 'ON') {
+ document.getElementById("status" + username + product_id).innerHTML = "<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/on.png\">";
+ } else {
+ document.getElementById("status" + username + product_id).innerHTML = "<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/off.png\">";
+ }
+ }
+ };
+ xmlhttp.open("GET", "http://localhost:8080/ChatService/RetrieveStatus?username=" + username, true);
+ xmlhttp.send();
+ };
+ </script>
</head>
<body ng-app="chatApp" ng-controller="chatController">
@@ -246,18 +263,10 @@
out.print("<p>No product to be sold.</p>");
} else {
for (int i = 0; i < result.size(); i++) {
- urlParamChat = "username=" + result.get(i).getUsername();
- RestAPI_consumer consumer2 = new RestAPI_consumer(urlRequest2, urlParamChat);
- consumer2.execute();
- responseJSON = consumer2.getOutput();
- if (responseJSON.get("status").equals("ON")) {
- out.print("<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/on.png\">");
- out.print("<a href=\"\"><div ng-click=\"setReceiver('" + result.get(i).getUsername() + "')\"><p><b>" + result.get(i).getUsername() + "</a></b><br/>");
- } else {
- out.print("<img style=\"border: none; padding: 0px 10px 0px 0px; float:left\" height=15px width=15px src=\"img/off.png\">");
- out.print("<a href=\"\"><div ng-click=\"setReceiver('" + result.get(i).getUsername() + "')\"><p><b>" + result.get(i).getUsername() + "</a></b><br/>");
- }
- out.print("added this on " + result.get(i).getDate().getDate() + "</p></div>");
+ out.print("<script>setInterval(function(){ getState('" + result.get(i).getUsername() + "','" + result.get(i).getProductId() + "'); }, 1000);</script>");
+ out.print("<div id=\"status" + result.get(i).getUsername() + result.get(i).getProductId() +"\"></div>");
+ out.print("<a href=\"\"><div ng-click=\"setReceiver('" + result.get(i).getUsername() + "')\"><p><b>" + result.get(i).getUsername() + "</a></b><br/></div>");
+ out.print("added this on " + result.get(i).getDate().getDate() + "</p>");
out.print("<hr/>");
out.print("<table>");
out.print("<tr class = \"container\">");
@@ -341,7 +350,7 @@
}
}
%>
-
+
{{user}}
<br>
<div class="popup-box chat-popup" id="1" ng-show="isReceiverSet()" style="right: 0px; display: block;">
@@ -351,7 +360,7 @@
<div style="clear: both"></div>
</div>
<div class="popup-messages">
-
+
<li ng-repeat="message in messages" style="list-style-type:none">
<div ng-if="(message.name === receiver) && (message.to === user)" class="talk-bubble tri-right left-top">
<div class="talktext">
diff --git a/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/DBMarketPlace.class b/MarketPlaceService/build/web/WEB-INF/classes/org/KAA/MarketPlaceService/Service/DBMarketPlace.class
index 1e0163cfd7fc25fe3a7ba026e6a2ad1fafa47b04..2d4880d136a4e116e5424a53b14b97ade5d088bf 100644
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 ad801dc36eb26f8f17ef07d1e3213a372bd7674a..48d8c8e04f624d9512af5aeffffbf4b026bc41ed 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 9b8c42de6e80e91a83df10f66f7bb24c96ece632..bcefd2a8bd2f3a3f6c2f44d578c8417b01f2de43 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 d89dafe043b26783e2285ad1ee3edc910f8ea011..1ea3b4d947c6a812f9088f66551d0d9a60108144 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/dist/MarketPlaceService.war b/MarketPlaceService/dist/MarketPlaceService.war
index 72a56f1906956d0883b8b0e0ede390c4629b1b44..c4a58ab1945b218b6a178f5efb675e38a8a550b0 100644
Binary files a/MarketPlaceService/dist/MarketPlaceService.war and b/MarketPlaceService/dist/MarketPlaceService.war differ
diff --git a/MarketPlaceService/nbproject/private/private.properties b/MarketPlaceService/nbproject/private/private.properties
index 17b05e1fd355984e3470323a00669e8abef06ddb..28552d4ee798943351d4484319b203bb00c39ea6 100644
--- a/MarketPlaceService/nbproject/private/private.properties
+++ b/MarketPlaceService/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=/home/khrs/.netbeans/8.2/config/GlassFishEE6/Properties/gfv3-2049786751.properties
+deploy.ant.properties.file=C:\\Users\\Frys\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31137312071.properties
j2ee.platform.is.jsr109=true
-j2ee.server.domain=/home/khrs/glassfish-4.1.1/glassfish/domains/domain1
-j2ee.server.home=/home/khrs/glassfish-4.1.1/glassfish
-j2ee.server.instance=[/home/khrs/glassfish-4.1.1/glassfish:/home/khrs/glassfish-4.1.1/glassfish/domains/domain1]deployer:gfv3ee6wc:localhost:4848
-j2ee.server.middleware=/home/khrs/glassfish-4.1.1
+j2ee.server.domain=C:/Users/Frys/GlassFish_Server/glassfish/domains/domain-client
+j2ee.server.home=C:/Users/Frys/GlassFish_Server/glassfish
+j2ee.server.instance=[C:\\Users\\Frys\\GlassFish_Server\\glassfish;C:\\Users\\Frys\\GlassFish_Server\\glassfish\\domains\\domain-client]deployer:gfv3ee6wc:localhost:4848
+j2ee.server.middleware=C:/Users/Frys/GlassFish_Server
user.properties.file=/home/khrs/.netbeans/8.2/build.properties
diff --git a/MarketPlaceService/nbproject/project.properties b/MarketPlaceService/nbproject/project.properties
index 92afac1b58933b80846abbcadd56c1341a77cc84..e1f402b312c3857d5bcbc9707c6e65ed3d1627b8 100644
--- a/MarketPlaceService/nbproject/project.properties
+++ b/MarketPlaceService/nbproject/project.properties
@@ -40,9 +40,9 @@ j2ee.platform=1.7-web
<<<<<<< HEAD
=======
>>>>>>> bcf1435806005cb1ed3347eeb593de560332f805
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar