diff --git a/ChatService/nbproject/ant-deploy.xml b/ChatService/nbproject/ant-deploy.xml
index 5d33e0d6e743ce97b9b63e4c37346ab71071ce70..2d5f8778d18757ea5ded4eea4da13ca1adc51093 100644
--- a/ChatService/nbproject/ant-deploy.xml
+++ b/ChatService/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/ChatService/nbproject/project.properties b/ChatService/nbproject/project.properties
index 4bdefc063824963cbd3b2759cb9d36020d4c9ffa..857af17e8ebf3d819a80df5f8d9c7b88eed0e73c 100644
--- a/ChatService/nbproject/project.properties
+++ b/ChatService/nbproject/project.properties
@@ -36,13 +36,13 @@ j2ee.deploy.on.save=true
 j2ee.platform=1.7-web
 <<<<<<< HEAD
 =======
-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
 >>>>>>> 267a82ca7eed3c74c463cfce0a377e9ab1f0f69f
 <<<<<<< HEAD
 j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
 =======
 j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
 >>>>>>> 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.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/DBAccount.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/DBAccount.class
index 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 5371d1e459b9d919c2df7acf3a6c141b1e234a15..277a3c5f67972f286188ac1932a28efae5576215 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 ccfd5e751d219473a8f2b67866bab4cb123998c6..8b95b90309a2ccc042402b7db83fb16bf70fe44f 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/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 0a28249b62f62baa723f11b21959dc63d18c0b1c..0f610372d1078b944a0531ab173b5f245cad22ab 100644
--- a/IdentService/nbproject/private/private.properties
+++ b/IdentService/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=C:\\Users\\Frys\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31137312071.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=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=C:\\Users\\Frys\\AppData\\Roaming\\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 092f8c9eaed58a630c059e6195f0ce367e615916..63b8113a7732757f69845ed2136fb2e7329926cd 100644
--- a/IdentService/nbproject/private/private.xml
+++ b/IdentService/nbproject/private/private.xml
@@ -3,7 +3,8 @@
     <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/login.java</file>
+            <file>file:/D:/Kuliah/IF%20ITB/Semester%205/Web%20Based%20Development/TugasBesar3_AngularJSandFirebase/IdentService/src/java/org/IdentService/login.java</file>
+            <file>file:/D:/Kuliah/IF%20ITB/Semester%205/Web%20Based%20Development/TugasBesar3_AngularJSandFirebase/IdentService/src/java/org/IdentService/validate.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/IdentService/nbproject/project.properties b/IdentService/nbproject/project.properties
index 7d798706a303268d137e02094eef167cdb6bef8e..d390d251cb2f88ff0522e136ca05c50304a3dc86 100644
--- a/IdentService/nbproject/project.properties
+++ b/IdentService/nbproject/project.properties
@@ -36,13 +36,13 @@ j2ee.deploy.on.save=true
 j2ee.platform=1.7-web
 <<<<<<< HEAD
 =======
-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
 >>>>>>> 267a82ca7eed3c74c463cfce0a377e9ab1f0f69f
 <<<<<<< HEAD
 j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
 =======
 j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
 >>>>>>> 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.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
diff --git a/IdentService/src/java/org/IdentService/login.java b/IdentService/src/java/org/IdentService/login.java
index 96d4bc90b81e31cbc883608bbe5e9a03a9b1e175..bbe0bf9e8e34fefbe9993c6601a45974f10e8700 100644
--- a/IdentService/src/java/org/IdentService/login.java
+++ b/IdentService/src/java/org/IdentService/login.java
@@ -98,8 +98,7 @@ public class login extends HttpServlet {
                    Date dt = cal.getTime();
                    //token akan expire dalam 60 menit
                    Timestamp ts = new Timestamp(dt.getTime());
-                   String generatedToken = tokenGenerator.nextString();
-                   generatedToken +=  ts.getTime();
+                   String generatedToken = generateToken(request);
                    sql = "insert into token values (\""+ user_id+ "\",\""+generatedToken+"\",\""+ts+"\")";
                    stmt.executeUpdate(sql);
 
@@ -176,9 +175,9 @@ public class login extends HttpServlet {
     
     public String generateToken(HttpServletRequest request){
         String token;
-        String user_agent = request.getHeader("User-Agent");
+        String user_agent = request.getParameter("user_agent");
         String ip = getClientIpAddress(request);
-        token = tokenGenerator.nextString() + "#" + user_agent + '#' + ip;
+        token = tokenGenerator.nextString() + "|" + user_agent + '|' + ip;
         return token;
     }
 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/AddEditProduct.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/AddEditProduct.java
index 95f832fdfb1620787b982374867d27f87054e39a..7db42fdfb3ea43a46ca80a878c9eb1c0737766b0 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/AddEditProduct.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/AddEditProduct.java
@@ -13,21 +13,21 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="add_edit_product"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="price" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="image" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="option" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="add_edit_product">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="price" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="image" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="option" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/AddEditProductResponse.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/AddEditProductResponse.java
index 87108b6122b160281f2a540308d5b01d6a051a5d..319fbbd6187dc492e49afdc7dd70f666162b0c3e 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/AddEditProductResponse.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/AddEditProductResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="add_edit_productResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="ProcedureStatus" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="add_edit_productResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ProcedureStatus" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Buy.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Buy.java
index 480c3eef2ed8f6b0126e39c3c7851447cb4aa18b..6fa3784182c3449399e68e8d04bafb6f57bd94ce 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Buy.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Buy.java
@@ -13,21 +13,21 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="buy"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="quantity" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="cosignee" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="fulladdress" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="postalcode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="phone_number" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="buy">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="quantity" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="cosignee" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="fulladdress" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="postalcode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="phone_number" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/BuyResponse.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/BuyResponse.java
index 06abb42bf20a200a524611f72797674e20004cc9..330c547a47354fe13658f79f1c7d8fde6743bf82 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/BuyResponse.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/BuyResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="buyResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="buyResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/DeleteProduct.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/DeleteProduct.java
index 78014a6c04d4a69d70df41cbb18db5beb80d93e4..31fc197cb947417ab327d61500b77340a8a2af19 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/DeleteProduct.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/DeleteProduct.java
@@ -13,16 +13,16 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="delete_product"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="delete_product">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/DeleteProductResponse.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/DeleteProductResponse.java
index 7e7b53b20b541425d66d6aba646c81eea5f3888e..8d90007612a6ef7102a3f3027c3e47b3174d5b11 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/DeleteProductResponse.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/DeleteProductResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="delete_productResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="delete_productResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetLikes.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetLikes.java
index 65fef46de4cf1adde8a9b0fabdfadfbbe9968609..6ddd7d799ab1a83264266c63a31dfbae7a0fc108 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetLikes.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetLikes.java
@@ -12,15 +12,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="getLikes"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="pid" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="getLikes">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="pid" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetLikesResponse.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetLikesResponse.java
index b4cbda1cf4e03c253da9acfedb7b66fefeb26da5..9c382b2bbeef35e24f2cc26b0d9179a2aff9543e 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetLikesResponse.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetLikesResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="getLikesResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="getLikesResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetProduct.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetProduct.java
index d37af5b7c87d27555f9cd3132d91bb86a1fdf674..b48f348e5234342ea3f7459edba1bf0a91dbcd85 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetProduct.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetProduct.java
@@ -13,16 +13,16 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="get_product"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="get_product">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetProductResponse.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetProductResponse.java
index 49bb7100c84c3a15ea2734ccd52336aa6a8d6d3d..18c0120114c73d3296e2807fa7ac1812275d4461 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetProductResponse.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetProductResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="get_productResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}product" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="get_productResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}product" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetPurchases.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetPurchases.java
index c5be27978aaa16be83db3ad9f0504d3400acd01f..457027ba7ba1ce2f79b5231c9a812b3f3bbddbb3 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetPurchases.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetPurchases.java
@@ -12,15 +12,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="getPurchases"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="pid" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="getPurchases">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="pid" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetPurchasesResponse.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetPurchasesResponse.java
index 296df540cfeee3fbfd8d177e1639a8ef2dd00131..329bece413f0887b79a2ea9eb2774ad382456b53 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetPurchasesResponse.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetPurchasesResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="getPurchasesResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="getPurchasesResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetSalesPurchases.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetSalesPurchases.java
index f7e3c5f1c75b80c28dcf1892d9c892251256ec9b..cbfe01b688ad78dc3e1b258e0cd565c87b384466 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetSalesPurchases.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetSalesPurchases.java
@@ -12,16 +12,16 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="get_sales_purchases"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="option" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="get_sales_purchases">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="option" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetSalesPurchasesResponse.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetSalesPurchasesResponse.java
index 6abdfc030d9f7667cf869556f34ff05e3716f4ab..6077ff1c8b68e371197af8813d96e80873fc139a 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetSalesPurchasesResponse.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetSalesPurchasesResponse.java
@@ -15,15 +15,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="get_sales_purchasesResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="Purchase" type="{http://Service.MarketPlaceService.KAA.org/}purchase" maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="get_sales_purchasesResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Purchase" type="{http://Service.MarketPlaceService.KAA.org/}purchase" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetYourProduct.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetYourProduct.java
index a7aff311191533ed9caa694ecfd27202a9d3961b..51cef17fe47120d2c5d3e616de0d8f2e25b63e73 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetYourProduct.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetYourProduct.java
@@ -12,15 +12,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="getYourProduct"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="getYourProduct">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetYourProductResponse.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetYourProductResponse.java
index 23b03e567d65928cb202500cd92372298849c452..94de12a4f968cc89caf528de9876dd8dd0368f00 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetYourProductResponse.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetYourProductResponse.java
@@ -15,15 +15,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="getYourProductResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}product" maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="getYourProductResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}product" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/IsLiked.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/IsLiked.java
index 96975ec32cb33802236f5d390ad8e5e7183f6fca..990d65e2bdb22cb75e5453689e9d065d139f14b2 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/IsLiked.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/IsLiked.java
@@ -12,16 +12,16 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="isLiked"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="pid" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="isLiked">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="pid" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/IsLikedResponse.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/IsLikedResponse.java
index 72e1027030e03e0935a7463edef0856cb5ac0acd..1e32d66ad045da3701ba353491002c1792fb2fb7 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/IsLikedResponse.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/IsLikedResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="isLikedResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="isLikedResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/MarketPlaceService.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/MarketPlaceService.java
index 342c6a7eca81091668e69a4cad5a7825887a4476..ea0a9536e90a4e446eb44bda561593be2bc3dd1f 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/MarketPlaceService.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/MarketPlaceService.java
@@ -14,7 +14,7 @@ import javax.xml.ws.ResponseWrapper;
 
 /**
  * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.11-b150120.1832
+ * JAX-WS RI 2.2.10-b140803.1500
  * Generated source version: 2.2
  * 
  */
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/MarketPlaceService_Service.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/MarketPlaceService_Service.java
index f7d517c72836fb52b7a358c5abfd8c7901f634ce..736cef8a0c6d47e263cb958adb57587b98b22b94 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/MarketPlaceService_Service.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/MarketPlaceService_Service.java
@@ -13,7 +13,7 @@ import javax.xml.ws.WebServiceFeature;
 
 /**
  * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.11-b150120.1832
+ * JAX-WS RI 2.2.10-b140803.1500
  * Generated source version: 2.2
  * 
  */
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ObjectFactory.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ObjectFactory.java
index 8bea78aea16010112ca386cdc93b6102018db0a6..0c274bbb0053f6e504e7c42274c9806cedb80699 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ObjectFactory.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ObjectFactory.java
@@ -24,33 +24,33 @@ import javax.xml.namespace.QName;
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _ProcedureStatus_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "ProcedureStatus");
     private final static QName _Product_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "Product");
-    private final static QName _Purchase_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "Purchase");
-    private final static QName _AddEditProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "add_edit_product");
-    private final static QName _AddEditProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "add_edit_productResponse");
-    private final static QName _Buy_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "buy");
-    private final static QName _BuyResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "buyResponse");
-    private final static QName _DeleteProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "delete_product");
-    private final static QName _DeleteProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "delete_productResponse");
-    private final static QName _GetLikes_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getLikes");
-    private final static QName _GetLikesResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getLikesResponse");
-    private final static QName _GetPurchases_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getPurchases");
+    private final static QName _GetProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "get_productResponse");
+    private final static QName _GetSalesPurchasesResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "get_sales_purchasesResponse");
     private final static QName _GetPurchasesResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getPurchasesResponse");
-    private final static QName _GetYourProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getYourProduct");
-    private final static QName _GetYourProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getYourProductResponse");
+    private final static QName _IsLikedResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "isLikedResponse");
+    private final static QName _GetLikesResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getLikesResponse");
+    private final static QName _GetLikes_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getLikes");
+    private final static QName _RetrieveAllProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "retrieve_all_productResponse");
+    private final static QName _Buy_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "buy");
     private final static QName _GetProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "get_product");
-    private final static QName _GetProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "get_productResponse");
+    private final static QName _SearchProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "search_productResponse");
+    private final static QName _GetYourProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getYourProduct");
+    private final static QName _ProcedureStatus_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "ProcedureStatus");
+    private final static QName _SearchProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "search_product");
     private final static QName _GetSalesPurchases_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "get_sales_purchases");
-    private final static QName _GetSalesPurchasesResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "get_sales_purchasesResponse");
     private final static QName _IsLiked_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "isLiked");
-    private final static QName _IsLikedResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "isLikedResponse");
     private final static QName _ProcessLike_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "processLike");
-    private final static QName _ProcessLikeResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "processLikeResponse");
     private final static QName _RetrieveAllProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "retrieve_all_product");
-    private final static QName _RetrieveAllProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "retrieve_all_productResponse");
-    private final static QName _SearchProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "search_product");
-    private final static QName _SearchProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "search_productResponse");
+    private final static QName _ProcessLikeResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "processLikeResponse");
+    private final static QName _BuyResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "buyResponse");
+    private final static QName _Purchase_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "Purchase");
+    private final static QName _GetPurchases_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getPurchases");
+    private final static QName _AddEditProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "add_edit_productResponse");
+    private final static QName _DeleteProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "delete_product");
+    private final static QName _GetYourProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getYourProductResponse");
+    private final static QName _AddEditProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "add_edit_product");
+    private final static QName _DeleteProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "delete_productResponse");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.kaa.marketplaceservice.service
@@ -60,43 +60,43 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ProcedureStatus }
+     * Create an instance of {@link GetPurchasesResponse }
      * 
      */
-    public ProcedureStatus createProcedureStatus() {
-        return new ProcedureStatus();
+    public GetPurchasesResponse createGetPurchasesResponse() {
+        return new GetPurchasesResponse();
     }
 
     /**
-     * Create an instance of {@link Product }
+     * Create an instance of {@link IsLikedResponse }
      * 
      */
-    public Product createProduct() {
-        return new Product();
+    public IsLikedResponse createIsLikedResponse() {
+        return new IsLikedResponse();
     }
 
     /**
-     * Create an instance of {@link Purchase }
+     * Create an instance of {@link GetLikesResponse }
      * 
      */
-    public Purchase createPurchase() {
-        return new Purchase();
+    public GetLikesResponse createGetLikesResponse() {
+        return new GetLikesResponse();
     }
 
     /**
-     * Create an instance of {@link AddEditProduct }
+     * Create an instance of {@link GetLikes }
      * 
      */
-    public AddEditProduct createAddEditProduct() {
-        return new AddEditProduct();
+    public GetLikes createGetLikes() {
+        return new GetLikes();
     }
 
     /**
-     * Create an instance of {@link AddEditProductResponse }
+     * Create an instance of {@link RetrieveAllProductResponse }
      * 
      */
-    public AddEditProductResponse createAddEditProductResponse() {
-        return new AddEditProductResponse();
+    public RetrieveAllProductResponse createRetrieveAllProductResponse() {
+        return new RetrieveAllProductResponse();
     }
 
     /**
@@ -108,171 +108,171 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link BuyResponse }
+     * Create an instance of {@link Product }
      * 
      */
-    public BuyResponse createBuyResponse() {
-        return new BuyResponse();
+    public Product createProduct() {
+        return new Product();
     }
 
     /**
-     * Create an instance of {@link DeleteProduct }
+     * Create an instance of {@link GetProductResponse }
      * 
      */
-    public DeleteProduct createDeleteProduct() {
-        return new DeleteProduct();
+    public GetProductResponse createGetProductResponse() {
+        return new GetProductResponse();
     }
 
     /**
-     * Create an instance of {@link DeleteProductResponse }
+     * Create an instance of {@link GetSalesPurchasesResponse }
      * 
      */
-    public DeleteProductResponse createDeleteProductResponse() {
-        return new DeleteProductResponse();
+    public GetSalesPurchasesResponse createGetSalesPurchasesResponse() {
+        return new GetSalesPurchasesResponse();
     }
 
     /**
-     * Create an instance of {@link GetLikes }
+     * Create an instance of {@link ProcedureStatus }
      * 
      */
-    public GetLikes createGetLikes() {
-        return new GetLikes();
+    public ProcedureStatus createProcedureStatus() {
+        return new ProcedureStatus();
     }
 
     /**
-     * Create an instance of {@link GetLikesResponse }
+     * Create an instance of {@link SearchProduct }
      * 
      */
-    public GetLikesResponse createGetLikesResponse() {
-        return new GetLikesResponse();
+    public SearchProduct createSearchProduct() {
+        return new SearchProduct();
     }
 
     /**
-     * Create an instance of {@link GetPurchases }
+     * Create an instance of {@link GetSalesPurchases }
      * 
      */
-    public GetPurchases createGetPurchases() {
-        return new GetPurchases();
+    public GetSalesPurchases createGetSalesPurchases() {
+        return new GetSalesPurchases();
     }
 
     /**
-     * Create an instance of {@link GetPurchasesResponse }
+     * Create an instance of {@link GetProduct }
      * 
      */
-    public GetPurchasesResponse createGetPurchasesResponse() {
-        return new GetPurchasesResponse();
+    public GetProduct createGetProduct() {
+        return new GetProduct();
     }
 
     /**
-     * Create an instance of {@link GetYourProduct }
+     * Create an instance of {@link SearchProductResponse }
      * 
      */
-    public GetYourProduct createGetYourProduct() {
-        return new GetYourProduct();
+    public SearchProductResponse createSearchProductResponse() {
+        return new SearchProductResponse();
     }
 
     /**
-     * Create an instance of {@link GetYourProductResponse }
+     * Create an instance of {@link GetYourProduct }
      * 
      */
-    public GetYourProductResponse createGetYourProductResponse() {
-        return new GetYourProductResponse();
+    public GetYourProduct createGetYourProduct() {
+        return new GetYourProduct();
     }
 
     /**
-     * Create an instance of {@link GetProduct }
+     * Create an instance of {@link BuyResponse }
      * 
      */
-    public GetProduct createGetProduct() {
-        return new GetProduct();
+    public BuyResponse createBuyResponse() {
+        return new BuyResponse();
     }
 
     /**
-     * Create an instance of {@link GetProductResponse }
+     * Create an instance of {@link Purchase }
      * 
      */
-    public GetProductResponse createGetProductResponse() {
-        return new GetProductResponse();
+    public Purchase createPurchase() {
+        return new Purchase();
     }
 
     /**
-     * Create an instance of {@link GetSalesPurchases }
+     * Create an instance of {@link IsLiked }
      * 
      */
-    public GetSalesPurchases createGetSalesPurchases() {
-        return new GetSalesPurchases();
+    public IsLiked createIsLiked() {
+        return new IsLiked();
     }
 
     /**
-     * Create an instance of {@link GetSalesPurchasesResponse }
+     * Create an instance of {@link ProcessLike }
      * 
      */
-    public GetSalesPurchasesResponse createGetSalesPurchasesResponse() {
-        return new GetSalesPurchasesResponse();
+    public ProcessLike createProcessLike() {
+        return new ProcessLike();
     }
 
     /**
-     * Create an instance of {@link IsLiked }
+     * Create an instance of {@link RetrieveAllProduct }
      * 
      */
-    public IsLiked createIsLiked() {
-        return new IsLiked();
+    public RetrieveAllProduct createRetrieveAllProduct() {
+        return new RetrieveAllProduct();
     }
 
     /**
-     * Create an instance of {@link IsLikedResponse }
+     * Create an instance of {@link ProcessLikeResponse }
      * 
      */
-    public IsLikedResponse createIsLikedResponse() {
-        return new IsLikedResponse();
+    public ProcessLikeResponse createProcessLikeResponse() {
+        return new ProcessLikeResponse();
     }
 
     /**
-     * Create an instance of {@link ProcessLike }
+     * Create an instance of {@link DeleteProductResponse }
      * 
      */
-    public ProcessLike createProcessLike() {
-        return new ProcessLike();
+    public DeleteProductResponse createDeleteProductResponse() {
+        return new DeleteProductResponse();
     }
 
     /**
-     * Create an instance of {@link ProcessLikeResponse }
+     * Create an instance of {@link GetPurchases }
      * 
      */
-    public ProcessLikeResponse createProcessLikeResponse() {
-        return new ProcessLikeResponse();
+    public GetPurchases createGetPurchases() {
+        return new GetPurchases();
     }
 
     /**
-     * Create an instance of {@link RetrieveAllProduct }
+     * Create an instance of {@link AddEditProductResponse }
      * 
      */
-    public RetrieveAllProduct createRetrieveAllProduct() {
-        return new RetrieveAllProduct();
+    public AddEditProductResponse createAddEditProductResponse() {
+        return new AddEditProductResponse();
     }
 
     /**
-     * Create an instance of {@link RetrieveAllProductResponse }
+     * Create an instance of {@link DeleteProduct }
      * 
      */
-    public RetrieveAllProductResponse createRetrieveAllProductResponse() {
-        return new RetrieveAllProductResponse();
+    public DeleteProduct createDeleteProduct() {
+        return new DeleteProduct();
     }
 
     /**
-     * Create an instance of {@link SearchProduct }
+     * Create an instance of {@link GetYourProductResponse }
      * 
      */
-    public SearchProduct createSearchProduct() {
-        return new SearchProduct();
+    public GetYourProductResponse createGetYourProductResponse() {
+        return new GetYourProductResponse();
     }
 
     /**
-     * Create an instance of {@link SearchProductResponse }
+     * Create an instance of {@link AddEditProduct }
      * 
      */
-    public SearchProductResponse createSearchProductResponse() {
-        return new SearchProductResponse();
+    public AddEditProduct createAddEditProduct() {
+        return new AddEditProduct();
     }
 
     /**
@@ -283,15 +283,6 @@ public class ObjectFactory {
         return new Ts();
     }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ProcedureStatus }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "ProcedureStatus")
-    public JAXBElement<ProcedureStatus> createProcedureStatus(ProcedureStatus value) {
-        return new JAXBElement<ProcedureStatus>(_ProcedureStatus_QNAME, ProcedureStatus.class, null, value);
-    }
-
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link Product }{@code >}}
      * 
@@ -302,66 +293,48 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Purchase }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "Purchase")
-    public JAXBElement<Purchase> createPurchase(Purchase value) {
-        return new JAXBElement<Purchase>(_Purchase_QNAME, Purchase.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AddEditProduct }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "add_edit_product")
-    public JAXBElement<AddEditProduct> createAddEditProduct(AddEditProduct value) {
-        return new JAXBElement<AddEditProduct>(_AddEditProduct_QNAME, AddEditProduct.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AddEditProductResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetProductResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "add_edit_productResponse")
-    public JAXBElement<AddEditProductResponse> createAddEditProductResponse(AddEditProductResponse value) {
-        return new JAXBElement<AddEditProductResponse>(_AddEditProductResponse_QNAME, AddEditProductResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "get_productResponse")
+    public JAXBElement<GetProductResponse> createGetProductResponse(GetProductResponse value) {
+        return new JAXBElement<GetProductResponse>(_GetProductResponse_QNAME, GetProductResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Buy }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetSalesPurchasesResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "buy")
-    public JAXBElement<Buy> createBuy(Buy value) {
-        return new JAXBElement<Buy>(_Buy_QNAME, Buy.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "get_sales_purchasesResponse")
+    public JAXBElement<GetSalesPurchasesResponse> createGetSalesPurchasesResponse(GetSalesPurchasesResponse value) {
+        return new JAXBElement<GetSalesPurchasesResponse>(_GetSalesPurchasesResponse_QNAME, GetSalesPurchasesResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BuyResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetPurchasesResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "buyResponse")
-    public JAXBElement<BuyResponse> createBuyResponse(BuyResponse value) {
-        return new JAXBElement<BuyResponse>(_BuyResponse_QNAME, BuyResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getPurchasesResponse")
+    public JAXBElement<GetPurchasesResponse> createGetPurchasesResponse(GetPurchasesResponse value) {
+        return new JAXBElement<GetPurchasesResponse>(_GetPurchasesResponse_QNAME, GetPurchasesResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteProduct }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link IsLikedResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "delete_product")
-    public JAXBElement<DeleteProduct> createDeleteProduct(DeleteProduct value) {
-        return new JAXBElement<DeleteProduct>(_DeleteProduct_QNAME, DeleteProduct.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "isLikedResponse")
+    public JAXBElement<IsLikedResponse> createIsLikedResponse(IsLikedResponse value) {
+        return new JAXBElement<IsLikedResponse>(_IsLikedResponse_QNAME, IsLikedResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteProductResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetLikesResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "delete_productResponse")
-    public JAXBElement<DeleteProductResponse> createDeleteProductResponse(DeleteProductResponse value) {
-        return new JAXBElement<DeleteProductResponse>(_DeleteProductResponse_QNAME, DeleteProductResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getLikesResponse")
+    public JAXBElement<GetLikesResponse> createGetLikesResponse(GetLikesResponse value) {
+        return new JAXBElement<GetLikesResponse>(_GetLikesResponse_QNAME, GetLikesResponse.class, null, value);
     }
 
     /**
@@ -374,66 +347,66 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetLikesResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link RetrieveAllProductResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getLikesResponse")
-    public JAXBElement<GetLikesResponse> createGetLikesResponse(GetLikesResponse value) {
-        return new JAXBElement<GetLikesResponse>(_GetLikesResponse_QNAME, GetLikesResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "retrieve_all_productResponse")
+    public JAXBElement<RetrieveAllProductResponse> createRetrieveAllProductResponse(RetrieveAllProductResponse value) {
+        return new JAXBElement<RetrieveAllProductResponse>(_RetrieveAllProductResponse_QNAME, RetrieveAllProductResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetPurchases }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link Buy }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getPurchases")
-    public JAXBElement<GetPurchases> createGetPurchases(GetPurchases value) {
-        return new JAXBElement<GetPurchases>(_GetPurchases_QNAME, GetPurchases.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "buy")
+    public JAXBElement<Buy> createBuy(Buy value) {
+        return new JAXBElement<Buy>(_Buy_QNAME, Buy.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetPurchasesResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetProduct }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getPurchasesResponse")
-    public JAXBElement<GetPurchasesResponse> createGetPurchasesResponse(GetPurchasesResponse value) {
-        return new JAXBElement<GetPurchasesResponse>(_GetPurchasesResponse_QNAME, GetPurchasesResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "get_product")
+    public JAXBElement<GetProduct> createGetProduct(GetProduct value) {
+        return new JAXBElement<GetProduct>(_GetProduct_QNAME, GetProduct.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetYourProduct }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SearchProductResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getYourProduct")
-    public JAXBElement<GetYourProduct> createGetYourProduct(GetYourProduct value) {
-        return new JAXBElement<GetYourProduct>(_GetYourProduct_QNAME, GetYourProduct.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "search_productResponse")
+    public JAXBElement<SearchProductResponse> createSearchProductResponse(SearchProductResponse value) {
+        return new JAXBElement<SearchProductResponse>(_SearchProductResponse_QNAME, SearchProductResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetYourProductResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetYourProduct }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getYourProductResponse")
-    public JAXBElement<GetYourProductResponse> createGetYourProductResponse(GetYourProductResponse value) {
-        return new JAXBElement<GetYourProductResponse>(_GetYourProductResponse_QNAME, GetYourProductResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getYourProduct")
+    public JAXBElement<GetYourProduct> createGetYourProduct(GetYourProduct value) {
+        return new JAXBElement<GetYourProduct>(_GetYourProduct_QNAME, GetYourProduct.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetProduct }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ProcedureStatus }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "get_product")
-    public JAXBElement<GetProduct> createGetProduct(GetProduct value) {
-        return new JAXBElement<GetProduct>(_GetProduct_QNAME, GetProduct.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "ProcedureStatus")
+    public JAXBElement<ProcedureStatus> createProcedureStatus(ProcedureStatus value) {
+        return new JAXBElement<ProcedureStatus>(_ProcedureStatus_QNAME, ProcedureStatus.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetProductResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SearchProduct }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "get_productResponse")
-    public JAXBElement<GetProductResponse> createGetProductResponse(GetProductResponse value) {
-        return new JAXBElement<GetProductResponse>(_GetProductResponse_QNAME, GetProductResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "search_product")
+    public JAXBElement<SearchProduct> createSearchProduct(SearchProduct value) {
+        return new JAXBElement<SearchProduct>(_SearchProduct_QNAME, SearchProduct.class, null, value);
     }
 
     /**
@@ -445,15 +418,6 @@ public class ObjectFactory {
         return new JAXBElement<GetSalesPurchases>(_GetSalesPurchases_QNAME, GetSalesPurchases.class, null, value);
     }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetSalesPurchasesResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "get_sales_purchasesResponse")
-    public JAXBElement<GetSalesPurchasesResponse> createGetSalesPurchasesResponse(GetSalesPurchasesResponse value) {
-        return new JAXBElement<GetSalesPurchasesResponse>(_GetSalesPurchasesResponse_QNAME, GetSalesPurchasesResponse.class, null, value);
-    }
-
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link IsLiked }{@code >}}
      * 
@@ -464,21 +428,21 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsLikedResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ProcessLike }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "isLikedResponse")
-    public JAXBElement<IsLikedResponse> createIsLikedResponse(IsLikedResponse value) {
-        return new JAXBElement<IsLikedResponse>(_IsLikedResponse_QNAME, IsLikedResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "processLike")
+    public JAXBElement<ProcessLike> createProcessLike(ProcessLike value) {
+        return new JAXBElement<ProcessLike>(_ProcessLike_QNAME, ProcessLike.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ProcessLike }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link RetrieveAllProduct }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "processLike")
-    public JAXBElement<ProcessLike> createProcessLike(ProcessLike value) {
-        return new JAXBElement<ProcessLike>(_ProcessLike_QNAME, ProcessLike.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "retrieve_all_product")
+    public JAXBElement<RetrieveAllProduct> createRetrieveAllProduct(RetrieveAllProduct value) {
+        return new JAXBElement<RetrieveAllProduct>(_RetrieveAllProduct_QNAME, RetrieveAllProduct.class, null, value);
     }
 
     /**
@@ -491,39 +455,75 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RetrieveAllProduct }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link BuyResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "retrieve_all_product")
-    public JAXBElement<RetrieveAllProduct> createRetrieveAllProduct(RetrieveAllProduct value) {
-        return new JAXBElement<RetrieveAllProduct>(_RetrieveAllProduct_QNAME, RetrieveAllProduct.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "buyResponse")
+    public JAXBElement<BuyResponse> createBuyResponse(BuyResponse value) {
+        return new JAXBElement<BuyResponse>(_BuyResponse_QNAME, BuyResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RetrieveAllProductResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link Purchase }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "retrieve_all_productResponse")
-    public JAXBElement<RetrieveAllProductResponse> createRetrieveAllProductResponse(RetrieveAllProductResponse value) {
-        return new JAXBElement<RetrieveAllProductResponse>(_RetrieveAllProductResponse_QNAME, RetrieveAllProductResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "Purchase")
+    public JAXBElement<Purchase> createPurchase(Purchase value) {
+        return new JAXBElement<Purchase>(_Purchase_QNAME, Purchase.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SearchProduct }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetPurchases }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "search_product")
-    public JAXBElement<SearchProduct> createSearchProduct(SearchProduct value) {
-        return new JAXBElement<SearchProduct>(_SearchProduct_QNAME, SearchProduct.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getPurchases")
+    public JAXBElement<GetPurchases> createGetPurchases(GetPurchases value) {
+        return new JAXBElement<GetPurchases>(_GetPurchases_QNAME, GetPurchases.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SearchProductResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AddEditProductResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "search_productResponse")
-    public JAXBElement<SearchProductResponse> createSearchProductResponse(SearchProductResponse value) {
-        return new JAXBElement<SearchProductResponse>(_SearchProductResponse_QNAME, SearchProductResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "add_edit_productResponse")
+    public JAXBElement<AddEditProductResponse> createAddEditProductResponse(AddEditProductResponse value) {
+        return new JAXBElement<AddEditProductResponse>(_AddEditProductResponse_QNAME, AddEditProductResponse.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteProduct }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "delete_product")
+    public JAXBElement<DeleteProduct> createDeleteProduct(DeleteProduct value) {
+        return new JAXBElement<DeleteProduct>(_DeleteProduct_QNAME, DeleteProduct.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetYourProductResponse }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getYourProductResponse")
+    public JAXBElement<GetYourProductResponse> createGetYourProductResponse(GetYourProductResponse value) {
+        return new JAXBElement<GetYourProductResponse>(_GetYourProductResponse_QNAME, GetYourProductResponse.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AddEditProduct }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "add_edit_product")
+    public JAXBElement<AddEditProduct> createAddEditProduct(AddEditProduct value) {
+        return new JAXBElement<AddEditProduct>(_AddEditProduct_QNAME, AddEditProduct.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteProductResponse }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "delete_productResponse")
+    public JAXBElement<DeleteProductResponse> createDeleteProductResponse(DeleteProductResponse value) {
+        return new JAXBElement<DeleteProductResponse>(_DeleteProductResponse_QNAME, DeleteProductResponse.class, null, value);
     }
 
 }
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ProcedureStatus.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ProcedureStatus.java
index e920737593ae8a68e2b77ae0df692ac8b0fd4f9c..fcc16e2b4ba85674d4c26f233f3c8fd0f4da80e0 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ProcedureStatus.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ProcedureStatus.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="procedureStatus"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="status" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="procedureStatus">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="status" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ProcessLike.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ProcessLike.java
index 37c162c55f250029821beabcdfe1f5af81f3f4a4..64be4e72effef6fb4788e9b26db36f6673a036ac 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ProcessLike.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ProcessLike.java
@@ -13,17 +13,17 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="processLike"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="like" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="processLike">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="like" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ProcessLikeResponse.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ProcessLikeResponse.java
index 7bea8ec42131b48162b33621cfc3cefa217174f9..43caee418a12a27e2bba61a6d93664dc6603988a 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ProcessLikeResponse.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/ProcessLikeResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="processLikeResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="processLikeResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Product.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Product.java
index 047665e0473628d2c44744a6e443270f65938bb9..0270f0fe14f542516440435a23638bc3204a412f 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Product.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Product.java
@@ -13,23 +13,23 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="product"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="status_code" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="price" type="{http://www.w3.org/2001/XMLSchema}long"/&gt;
- *         &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="image" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="date" type="{http://Service.MarketPlaceService.KAA.org/}ts"/&gt;
- *         &lt;element name="user_id" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="username" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="product">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="status_code" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="price" type="{http://www.w3.org/2001/XMLSchema}long"/>
+ *         &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="image" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="date" type="{http://Service.MarketPlaceService.KAA.org/}ts"/>
+ *         &lt;element name="user_id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="username" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Purchase.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Purchase.java
index dfa8ba39aa4e3224aaddab79c576d309a5ae880a..f1caf3f4fb4ab0fc33f0f072b6b85bfa7467d421 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Purchase.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Purchase.java
@@ -13,27 +13,27 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="purchase"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="purchase_id" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="product_name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="product_price" type="{http://www.w3.org/2001/XMLSchema}long"/&gt;
- *         &lt;element name="quantity" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="product_image" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="seller_id" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="buyer_id" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="buyer_name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="buyer_address" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="postal_code" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="phonenumber" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="date" type="{http://Service.MarketPlaceService.KAA.org/}ts"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="purchase">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="purchase_id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="product_name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="product_price" type="{http://www.w3.org/2001/XMLSchema}long"/>
+ *         &lt;element name="quantity" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="product_image" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="seller_id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="buyer_id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="buyer_name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="buyer_address" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="postal_code" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="phonenumber" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="date" type="{http://Service.MarketPlaceService.KAA.org/}ts"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/RetrieveAllProduct.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/RetrieveAllProduct.java
index 2fd70d400f36828236bae4f3563b1c273a3e7234..568a8887c8ed793b1f1f1c45287670088f91d844 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/RetrieveAllProduct.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/RetrieveAllProduct.java
@@ -12,15 +12,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="retrieve_all_product"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="retrieve_all_product">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/RetrieveAllProductResponse.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/RetrieveAllProductResponse.java
index 82b6f5a7f0dada218a67652dbf846a8ff5a6c415..939fd5f833abe6f1ac3b9d09f0312fff53d75108 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/RetrieveAllProductResponse.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/RetrieveAllProductResponse.java
@@ -15,15 +15,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="retrieve_all_productResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="Product" type="{http://Service.MarketPlaceService.KAA.org/}product" maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="retrieve_all_productResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Product" type="{http://Service.MarketPlaceService.KAA.org/}product" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/SearchProduct.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/SearchProduct.java
index e97d887104b92decb8293df5e4b8499fc015ab25..ec654166e5f33d9f1dab7a9afd80b039cad12614 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/SearchProduct.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/SearchProduct.java
@@ -12,17 +12,17 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="search_product"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="query" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="choice" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="search_product">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="query" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="choice" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/SearchProductResponse.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/SearchProductResponse.java
index 5703b450663256bc43547ac5963b91da66cd7b70..65cc09a52a0945469cbbdf7f3087c470966207a5 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/SearchProductResponse.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/SearchProductResponse.java
@@ -15,15 +15,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="search_productResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="Product" type="{http://Service.MarketPlaceService.KAA.org/}product" maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="search_productResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Product" type="{http://Service.MarketPlaceService.KAA.org/}product" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Ts.java b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Ts.java
index 00ea2e8df96654a7857b120c3b5a5da37a88a5d8..27b78dde80b9189a1bdbf8a7fcddbc43ced7b93a 100644
--- a/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Ts.java
+++ b/KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Ts.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="ts"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="date" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="ts">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="date" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/AddEditProduct.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/AddEditProduct.java
index 95f832fdfb1620787b982374867d27f87054e39a..7db42fdfb3ea43a46ca80a878c9eb1c0737766b0 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/AddEditProduct.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/AddEditProduct.java
@@ -13,21 +13,21 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="add_edit_product"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="price" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="image" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="option" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="add_edit_product">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="price" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="image" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="option" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/AddEditProductResponse.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/AddEditProductResponse.java
index 87108b6122b160281f2a540308d5b01d6a051a5d..319fbbd6187dc492e49afdc7dd70f666162b0c3e 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/AddEditProductResponse.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/AddEditProductResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="add_edit_productResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="ProcedureStatus" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="add_edit_productResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ProcedureStatus" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Buy.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Buy.java
index 480c3eef2ed8f6b0126e39c3c7851447cb4aa18b..6fa3784182c3449399e68e8d04bafb6f57bd94ce 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Buy.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Buy.java
@@ -13,21 +13,21 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="buy"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="quantity" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="cosignee" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="fulladdress" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="postalcode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="phone_number" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="buy">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="quantity" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="cosignee" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="fulladdress" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="postalcode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="phone_number" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/BuyResponse.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/BuyResponse.java
index 06abb42bf20a200a524611f72797674e20004cc9..330c547a47354fe13658f79f1c7d8fde6743bf82 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/BuyResponse.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/BuyResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="buyResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="buyResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/DeleteProduct.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/DeleteProduct.java
index 78014a6c04d4a69d70df41cbb18db5beb80d93e4..31fc197cb947417ab327d61500b77340a8a2af19 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/DeleteProduct.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/DeleteProduct.java
@@ -13,16 +13,16 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="delete_product"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="delete_product">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/DeleteProductResponse.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/DeleteProductResponse.java
index 7e7b53b20b541425d66d6aba646c81eea5f3888e..8d90007612a6ef7102a3f3027c3e47b3174d5b11 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/DeleteProductResponse.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/DeleteProductResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="delete_productResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="delete_productResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetLikes.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetLikes.java
index 65fef46de4cf1adde8a9b0fabdfadfbbe9968609..6ddd7d799ab1a83264266c63a31dfbae7a0fc108 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetLikes.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetLikes.java
@@ -12,15 +12,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="getLikes"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="pid" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="getLikes">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="pid" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetLikesResponse.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetLikesResponse.java
index b4cbda1cf4e03c253da9acfedb7b66fefeb26da5..9c382b2bbeef35e24f2cc26b0d9179a2aff9543e 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetLikesResponse.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetLikesResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="getLikesResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="getLikesResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetProduct.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetProduct.java
index d37af5b7c87d27555f9cd3132d91bb86a1fdf674..b48f348e5234342ea3f7459edba1bf0a91dbcd85 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetProduct.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetProduct.java
@@ -13,16 +13,16 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="get_product"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="get_product">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetProductResponse.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetProductResponse.java
index 49bb7100c84c3a15ea2734ccd52336aa6a8d6d3d..18c0120114c73d3296e2807fa7ac1812275d4461 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetProductResponse.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetProductResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="get_productResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}product" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="get_productResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}product" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetPurchases.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetPurchases.java
index c5be27978aaa16be83db3ad9f0504d3400acd01f..457027ba7ba1ce2f79b5231c9a812b3f3bbddbb3 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetPurchases.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetPurchases.java
@@ -12,15 +12,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="getPurchases"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="pid" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="getPurchases">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="pid" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetPurchasesResponse.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetPurchasesResponse.java
index 296df540cfeee3fbfd8d177e1639a8ef2dd00131..329bece413f0887b79a2ea9eb2774ad382456b53 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetPurchasesResponse.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetPurchasesResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="getPurchasesResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="getPurchasesResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetSalesPurchases.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetSalesPurchases.java
index f7e3c5f1c75b80c28dcf1892d9c892251256ec9b..cbfe01b688ad78dc3e1b258e0cd565c87b384466 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetSalesPurchases.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetSalesPurchases.java
@@ -12,16 +12,16 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="get_sales_purchases"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="option" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="get_sales_purchases">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="option" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetSalesPurchasesResponse.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetSalesPurchasesResponse.java
index 6abdfc030d9f7667cf869556f34ff05e3716f4ab..6077ff1c8b68e371197af8813d96e80873fc139a 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetSalesPurchasesResponse.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetSalesPurchasesResponse.java
@@ -15,15 +15,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="get_sales_purchasesResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="Purchase" type="{http://Service.MarketPlaceService.KAA.org/}purchase" maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="get_sales_purchasesResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Purchase" type="{http://Service.MarketPlaceService.KAA.org/}purchase" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetYourProduct.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetYourProduct.java
index a7aff311191533ed9caa694ecfd27202a9d3961b..51cef17fe47120d2c5d3e616de0d8f2e25b63e73 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetYourProduct.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetYourProduct.java
@@ -12,15 +12,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="getYourProduct"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="getYourProduct">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetYourProductResponse.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetYourProductResponse.java
index 23b03e567d65928cb202500cd92372298849c452..94de12a4f968cc89caf528de9876dd8dd0368f00 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetYourProductResponse.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/GetYourProductResponse.java
@@ -15,15 +15,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="getYourProductResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}product" maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="getYourProductResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}product" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/IsLiked.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/IsLiked.java
index 96975ec32cb33802236f5d390ad8e5e7183f6fca..990d65e2bdb22cb75e5453689e9d065d139f14b2 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/IsLiked.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/IsLiked.java
@@ -12,16 +12,16 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="isLiked"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="pid" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="isLiked">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="pid" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/IsLikedResponse.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/IsLikedResponse.java
index 72e1027030e03e0935a7463edef0856cb5ac0acd..1e32d66ad045da3701ba353491002c1792fb2fb7 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/IsLikedResponse.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/IsLikedResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="isLikedResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="isLikedResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/MarketPlaceService.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/MarketPlaceService.java
index 342c6a7eca81091668e69a4cad5a7825887a4476..ea0a9536e90a4e446eb44bda561593be2bc3dd1f 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/MarketPlaceService.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/MarketPlaceService.java
@@ -14,7 +14,7 @@ import javax.xml.ws.ResponseWrapper;
 
 /**
  * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.11-b150120.1832
+ * JAX-WS RI 2.2.10-b140803.1500
  * Generated source version: 2.2
  * 
  */
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/MarketPlaceService_Service.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/MarketPlaceService_Service.java
index f7d517c72836fb52b7a358c5abfd8c7901f634ce..736cef8a0c6d47e263cb958adb57587b98b22b94 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/MarketPlaceService_Service.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/MarketPlaceService_Service.java
@@ -13,7 +13,7 @@ import javax.xml.ws.WebServiceFeature;
 
 /**
  * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.11-b150120.1832
+ * JAX-WS RI 2.2.10-b140803.1500
  * Generated source version: 2.2
  * 
  */
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ObjectFactory.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ObjectFactory.java
index 8bea78aea16010112ca386cdc93b6102018db0a6..0c274bbb0053f6e504e7c42274c9806cedb80699 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ObjectFactory.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ObjectFactory.java
@@ -24,33 +24,33 @@ import javax.xml.namespace.QName;
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _ProcedureStatus_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "ProcedureStatus");
     private final static QName _Product_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "Product");
-    private final static QName _Purchase_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "Purchase");
-    private final static QName _AddEditProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "add_edit_product");
-    private final static QName _AddEditProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "add_edit_productResponse");
-    private final static QName _Buy_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "buy");
-    private final static QName _BuyResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "buyResponse");
-    private final static QName _DeleteProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "delete_product");
-    private final static QName _DeleteProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "delete_productResponse");
-    private final static QName _GetLikes_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getLikes");
-    private final static QName _GetLikesResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getLikesResponse");
-    private final static QName _GetPurchases_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getPurchases");
+    private final static QName _GetProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "get_productResponse");
+    private final static QName _GetSalesPurchasesResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "get_sales_purchasesResponse");
     private final static QName _GetPurchasesResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getPurchasesResponse");
-    private final static QName _GetYourProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getYourProduct");
-    private final static QName _GetYourProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getYourProductResponse");
+    private final static QName _IsLikedResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "isLikedResponse");
+    private final static QName _GetLikesResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getLikesResponse");
+    private final static QName _GetLikes_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getLikes");
+    private final static QName _RetrieveAllProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "retrieve_all_productResponse");
+    private final static QName _Buy_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "buy");
     private final static QName _GetProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "get_product");
-    private final static QName _GetProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "get_productResponse");
+    private final static QName _SearchProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "search_productResponse");
+    private final static QName _GetYourProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getYourProduct");
+    private final static QName _ProcedureStatus_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "ProcedureStatus");
+    private final static QName _SearchProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "search_product");
     private final static QName _GetSalesPurchases_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "get_sales_purchases");
-    private final static QName _GetSalesPurchasesResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "get_sales_purchasesResponse");
     private final static QName _IsLiked_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "isLiked");
-    private final static QName _IsLikedResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "isLikedResponse");
     private final static QName _ProcessLike_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "processLike");
-    private final static QName _ProcessLikeResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "processLikeResponse");
     private final static QName _RetrieveAllProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "retrieve_all_product");
-    private final static QName _RetrieveAllProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "retrieve_all_productResponse");
-    private final static QName _SearchProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "search_product");
-    private final static QName _SearchProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "search_productResponse");
+    private final static QName _ProcessLikeResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "processLikeResponse");
+    private final static QName _BuyResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "buyResponse");
+    private final static QName _Purchase_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "Purchase");
+    private final static QName _GetPurchases_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getPurchases");
+    private final static QName _AddEditProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "add_edit_productResponse");
+    private final static QName _DeleteProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "delete_product");
+    private final static QName _GetYourProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "getYourProductResponse");
+    private final static QName _AddEditProduct_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "add_edit_product");
+    private final static QName _DeleteProductResponse_QNAME = new QName("http://Service.MarketPlaceService.KAA.org/", "delete_productResponse");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.kaa.marketplaceservice.service
@@ -60,43 +60,43 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ProcedureStatus }
+     * Create an instance of {@link GetPurchasesResponse }
      * 
      */
-    public ProcedureStatus createProcedureStatus() {
-        return new ProcedureStatus();
+    public GetPurchasesResponse createGetPurchasesResponse() {
+        return new GetPurchasesResponse();
     }
 
     /**
-     * Create an instance of {@link Product }
+     * Create an instance of {@link IsLikedResponse }
      * 
      */
-    public Product createProduct() {
-        return new Product();
+    public IsLikedResponse createIsLikedResponse() {
+        return new IsLikedResponse();
     }
 
     /**
-     * Create an instance of {@link Purchase }
+     * Create an instance of {@link GetLikesResponse }
      * 
      */
-    public Purchase createPurchase() {
-        return new Purchase();
+    public GetLikesResponse createGetLikesResponse() {
+        return new GetLikesResponse();
     }
 
     /**
-     * Create an instance of {@link AddEditProduct }
+     * Create an instance of {@link GetLikes }
      * 
      */
-    public AddEditProduct createAddEditProduct() {
-        return new AddEditProduct();
+    public GetLikes createGetLikes() {
+        return new GetLikes();
     }
 
     /**
-     * Create an instance of {@link AddEditProductResponse }
+     * Create an instance of {@link RetrieveAllProductResponse }
      * 
      */
-    public AddEditProductResponse createAddEditProductResponse() {
-        return new AddEditProductResponse();
+    public RetrieveAllProductResponse createRetrieveAllProductResponse() {
+        return new RetrieveAllProductResponse();
     }
 
     /**
@@ -108,171 +108,171 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link BuyResponse }
+     * Create an instance of {@link Product }
      * 
      */
-    public BuyResponse createBuyResponse() {
-        return new BuyResponse();
+    public Product createProduct() {
+        return new Product();
     }
 
     /**
-     * Create an instance of {@link DeleteProduct }
+     * Create an instance of {@link GetProductResponse }
      * 
      */
-    public DeleteProduct createDeleteProduct() {
-        return new DeleteProduct();
+    public GetProductResponse createGetProductResponse() {
+        return new GetProductResponse();
     }
 
     /**
-     * Create an instance of {@link DeleteProductResponse }
+     * Create an instance of {@link GetSalesPurchasesResponse }
      * 
      */
-    public DeleteProductResponse createDeleteProductResponse() {
-        return new DeleteProductResponse();
+    public GetSalesPurchasesResponse createGetSalesPurchasesResponse() {
+        return new GetSalesPurchasesResponse();
     }
 
     /**
-     * Create an instance of {@link GetLikes }
+     * Create an instance of {@link ProcedureStatus }
      * 
      */
-    public GetLikes createGetLikes() {
-        return new GetLikes();
+    public ProcedureStatus createProcedureStatus() {
+        return new ProcedureStatus();
     }
 
     /**
-     * Create an instance of {@link GetLikesResponse }
+     * Create an instance of {@link SearchProduct }
      * 
      */
-    public GetLikesResponse createGetLikesResponse() {
-        return new GetLikesResponse();
+    public SearchProduct createSearchProduct() {
+        return new SearchProduct();
     }
 
     /**
-     * Create an instance of {@link GetPurchases }
+     * Create an instance of {@link GetSalesPurchases }
      * 
      */
-    public GetPurchases createGetPurchases() {
-        return new GetPurchases();
+    public GetSalesPurchases createGetSalesPurchases() {
+        return new GetSalesPurchases();
     }
 
     /**
-     * Create an instance of {@link GetPurchasesResponse }
+     * Create an instance of {@link GetProduct }
      * 
      */
-    public GetPurchasesResponse createGetPurchasesResponse() {
-        return new GetPurchasesResponse();
+    public GetProduct createGetProduct() {
+        return new GetProduct();
     }
 
     /**
-     * Create an instance of {@link GetYourProduct }
+     * Create an instance of {@link SearchProductResponse }
      * 
      */
-    public GetYourProduct createGetYourProduct() {
-        return new GetYourProduct();
+    public SearchProductResponse createSearchProductResponse() {
+        return new SearchProductResponse();
     }
 
     /**
-     * Create an instance of {@link GetYourProductResponse }
+     * Create an instance of {@link GetYourProduct }
      * 
      */
-    public GetYourProductResponse createGetYourProductResponse() {
-        return new GetYourProductResponse();
+    public GetYourProduct createGetYourProduct() {
+        return new GetYourProduct();
     }
 
     /**
-     * Create an instance of {@link GetProduct }
+     * Create an instance of {@link BuyResponse }
      * 
      */
-    public GetProduct createGetProduct() {
-        return new GetProduct();
+    public BuyResponse createBuyResponse() {
+        return new BuyResponse();
     }
 
     /**
-     * Create an instance of {@link GetProductResponse }
+     * Create an instance of {@link Purchase }
      * 
      */
-    public GetProductResponse createGetProductResponse() {
-        return new GetProductResponse();
+    public Purchase createPurchase() {
+        return new Purchase();
     }
 
     /**
-     * Create an instance of {@link GetSalesPurchases }
+     * Create an instance of {@link IsLiked }
      * 
      */
-    public GetSalesPurchases createGetSalesPurchases() {
-        return new GetSalesPurchases();
+    public IsLiked createIsLiked() {
+        return new IsLiked();
     }
 
     /**
-     * Create an instance of {@link GetSalesPurchasesResponse }
+     * Create an instance of {@link ProcessLike }
      * 
      */
-    public GetSalesPurchasesResponse createGetSalesPurchasesResponse() {
-        return new GetSalesPurchasesResponse();
+    public ProcessLike createProcessLike() {
+        return new ProcessLike();
     }
 
     /**
-     * Create an instance of {@link IsLiked }
+     * Create an instance of {@link RetrieveAllProduct }
      * 
      */
-    public IsLiked createIsLiked() {
-        return new IsLiked();
+    public RetrieveAllProduct createRetrieveAllProduct() {
+        return new RetrieveAllProduct();
     }
 
     /**
-     * Create an instance of {@link IsLikedResponse }
+     * Create an instance of {@link ProcessLikeResponse }
      * 
      */
-    public IsLikedResponse createIsLikedResponse() {
-        return new IsLikedResponse();
+    public ProcessLikeResponse createProcessLikeResponse() {
+        return new ProcessLikeResponse();
     }
 
     /**
-     * Create an instance of {@link ProcessLike }
+     * Create an instance of {@link DeleteProductResponse }
      * 
      */
-    public ProcessLike createProcessLike() {
-        return new ProcessLike();
+    public DeleteProductResponse createDeleteProductResponse() {
+        return new DeleteProductResponse();
     }
 
     /**
-     * Create an instance of {@link ProcessLikeResponse }
+     * Create an instance of {@link GetPurchases }
      * 
      */
-    public ProcessLikeResponse createProcessLikeResponse() {
-        return new ProcessLikeResponse();
+    public GetPurchases createGetPurchases() {
+        return new GetPurchases();
     }
 
     /**
-     * Create an instance of {@link RetrieveAllProduct }
+     * Create an instance of {@link AddEditProductResponse }
      * 
      */
-    public RetrieveAllProduct createRetrieveAllProduct() {
-        return new RetrieveAllProduct();
+    public AddEditProductResponse createAddEditProductResponse() {
+        return new AddEditProductResponse();
     }
 
     /**
-     * Create an instance of {@link RetrieveAllProductResponse }
+     * Create an instance of {@link DeleteProduct }
      * 
      */
-    public RetrieveAllProductResponse createRetrieveAllProductResponse() {
-        return new RetrieveAllProductResponse();
+    public DeleteProduct createDeleteProduct() {
+        return new DeleteProduct();
     }
 
     /**
-     * Create an instance of {@link SearchProduct }
+     * Create an instance of {@link GetYourProductResponse }
      * 
      */
-    public SearchProduct createSearchProduct() {
-        return new SearchProduct();
+    public GetYourProductResponse createGetYourProductResponse() {
+        return new GetYourProductResponse();
     }
 
     /**
-     * Create an instance of {@link SearchProductResponse }
+     * Create an instance of {@link AddEditProduct }
      * 
      */
-    public SearchProductResponse createSearchProductResponse() {
-        return new SearchProductResponse();
+    public AddEditProduct createAddEditProduct() {
+        return new AddEditProduct();
     }
 
     /**
@@ -283,15 +283,6 @@ public class ObjectFactory {
         return new Ts();
     }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ProcedureStatus }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "ProcedureStatus")
-    public JAXBElement<ProcedureStatus> createProcedureStatus(ProcedureStatus value) {
-        return new JAXBElement<ProcedureStatus>(_ProcedureStatus_QNAME, ProcedureStatus.class, null, value);
-    }
-
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link Product }{@code >}}
      * 
@@ -302,66 +293,48 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Purchase }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "Purchase")
-    public JAXBElement<Purchase> createPurchase(Purchase value) {
-        return new JAXBElement<Purchase>(_Purchase_QNAME, Purchase.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AddEditProduct }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "add_edit_product")
-    public JAXBElement<AddEditProduct> createAddEditProduct(AddEditProduct value) {
-        return new JAXBElement<AddEditProduct>(_AddEditProduct_QNAME, AddEditProduct.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AddEditProductResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetProductResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "add_edit_productResponse")
-    public JAXBElement<AddEditProductResponse> createAddEditProductResponse(AddEditProductResponse value) {
-        return new JAXBElement<AddEditProductResponse>(_AddEditProductResponse_QNAME, AddEditProductResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "get_productResponse")
+    public JAXBElement<GetProductResponse> createGetProductResponse(GetProductResponse value) {
+        return new JAXBElement<GetProductResponse>(_GetProductResponse_QNAME, GetProductResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Buy }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetSalesPurchasesResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "buy")
-    public JAXBElement<Buy> createBuy(Buy value) {
-        return new JAXBElement<Buy>(_Buy_QNAME, Buy.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "get_sales_purchasesResponse")
+    public JAXBElement<GetSalesPurchasesResponse> createGetSalesPurchasesResponse(GetSalesPurchasesResponse value) {
+        return new JAXBElement<GetSalesPurchasesResponse>(_GetSalesPurchasesResponse_QNAME, GetSalesPurchasesResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BuyResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetPurchasesResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "buyResponse")
-    public JAXBElement<BuyResponse> createBuyResponse(BuyResponse value) {
-        return new JAXBElement<BuyResponse>(_BuyResponse_QNAME, BuyResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getPurchasesResponse")
+    public JAXBElement<GetPurchasesResponse> createGetPurchasesResponse(GetPurchasesResponse value) {
+        return new JAXBElement<GetPurchasesResponse>(_GetPurchasesResponse_QNAME, GetPurchasesResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteProduct }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link IsLikedResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "delete_product")
-    public JAXBElement<DeleteProduct> createDeleteProduct(DeleteProduct value) {
-        return new JAXBElement<DeleteProduct>(_DeleteProduct_QNAME, DeleteProduct.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "isLikedResponse")
+    public JAXBElement<IsLikedResponse> createIsLikedResponse(IsLikedResponse value) {
+        return new JAXBElement<IsLikedResponse>(_IsLikedResponse_QNAME, IsLikedResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteProductResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetLikesResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "delete_productResponse")
-    public JAXBElement<DeleteProductResponse> createDeleteProductResponse(DeleteProductResponse value) {
-        return new JAXBElement<DeleteProductResponse>(_DeleteProductResponse_QNAME, DeleteProductResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getLikesResponse")
+    public JAXBElement<GetLikesResponse> createGetLikesResponse(GetLikesResponse value) {
+        return new JAXBElement<GetLikesResponse>(_GetLikesResponse_QNAME, GetLikesResponse.class, null, value);
     }
 
     /**
@@ -374,66 +347,66 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetLikesResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link RetrieveAllProductResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getLikesResponse")
-    public JAXBElement<GetLikesResponse> createGetLikesResponse(GetLikesResponse value) {
-        return new JAXBElement<GetLikesResponse>(_GetLikesResponse_QNAME, GetLikesResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "retrieve_all_productResponse")
+    public JAXBElement<RetrieveAllProductResponse> createRetrieveAllProductResponse(RetrieveAllProductResponse value) {
+        return new JAXBElement<RetrieveAllProductResponse>(_RetrieveAllProductResponse_QNAME, RetrieveAllProductResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetPurchases }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link Buy }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getPurchases")
-    public JAXBElement<GetPurchases> createGetPurchases(GetPurchases value) {
-        return new JAXBElement<GetPurchases>(_GetPurchases_QNAME, GetPurchases.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "buy")
+    public JAXBElement<Buy> createBuy(Buy value) {
+        return new JAXBElement<Buy>(_Buy_QNAME, Buy.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetPurchasesResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetProduct }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getPurchasesResponse")
-    public JAXBElement<GetPurchasesResponse> createGetPurchasesResponse(GetPurchasesResponse value) {
-        return new JAXBElement<GetPurchasesResponse>(_GetPurchasesResponse_QNAME, GetPurchasesResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "get_product")
+    public JAXBElement<GetProduct> createGetProduct(GetProduct value) {
+        return new JAXBElement<GetProduct>(_GetProduct_QNAME, GetProduct.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetYourProduct }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SearchProductResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getYourProduct")
-    public JAXBElement<GetYourProduct> createGetYourProduct(GetYourProduct value) {
-        return new JAXBElement<GetYourProduct>(_GetYourProduct_QNAME, GetYourProduct.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "search_productResponse")
+    public JAXBElement<SearchProductResponse> createSearchProductResponse(SearchProductResponse value) {
+        return new JAXBElement<SearchProductResponse>(_SearchProductResponse_QNAME, SearchProductResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetYourProductResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetYourProduct }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getYourProductResponse")
-    public JAXBElement<GetYourProductResponse> createGetYourProductResponse(GetYourProductResponse value) {
-        return new JAXBElement<GetYourProductResponse>(_GetYourProductResponse_QNAME, GetYourProductResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getYourProduct")
+    public JAXBElement<GetYourProduct> createGetYourProduct(GetYourProduct value) {
+        return new JAXBElement<GetYourProduct>(_GetYourProduct_QNAME, GetYourProduct.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetProduct }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ProcedureStatus }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "get_product")
-    public JAXBElement<GetProduct> createGetProduct(GetProduct value) {
-        return new JAXBElement<GetProduct>(_GetProduct_QNAME, GetProduct.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "ProcedureStatus")
+    public JAXBElement<ProcedureStatus> createProcedureStatus(ProcedureStatus value) {
+        return new JAXBElement<ProcedureStatus>(_ProcedureStatus_QNAME, ProcedureStatus.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetProductResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SearchProduct }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "get_productResponse")
-    public JAXBElement<GetProductResponse> createGetProductResponse(GetProductResponse value) {
-        return new JAXBElement<GetProductResponse>(_GetProductResponse_QNAME, GetProductResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "search_product")
+    public JAXBElement<SearchProduct> createSearchProduct(SearchProduct value) {
+        return new JAXBElement<SearchProduct>(_SearchProduct_QNAME, SearchProduct.class, null, value);
     }
 
     /**
@@ -445,15 +418,6 @@ public class ObjectFactory {
         return new JAXBElement<GetSalesPurchases>(_GetSalesPurchases_QNAME, GetSalesPurchases.class, null, value);
     }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetSalesPurchasesResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "get_sales_purchasesResponse")
-    public JAXBElement<GetSalesPurchasesResponse> createGetSalesPurchasesResponse(GetSalesPurchasesResponse value) {
-        return new JAXBElement<GetSalesPurchasesResponse>(_GetSalesPurchasesResponse_QNAME, GetSalesPurchasesResponse.class, null, value);
-    }
-
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link IsLiked }{@code >}}
      * 
@@ -464,21 +428,21 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsLikedResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ProcessLike }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "isLikedResponse")
-    public JAXBElement<IsLikedResponse> createIsLikedResponse(IsLikedResponse value) {
-        return new JAXBElement<IsLikedResponse>(_IsLikedResponse_QNAME, IsLikedResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "processLike")
+    public JAXBElement<ProcessLike> createProcessLike(ProcessLike value) {
+        return new JAXBElement<ProcessLike>(_ProcessLike_QNAME, ProcessLike.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ProcessLike }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link RetrieveAllProduct }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "processLike")
-    public JAXBElement<ProcessLike> createProcessLike(ProcessLike value) {
-        return new JAXBElement<ProcessLike>(_ProcessLike_QNAME, ProcessLike.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "retrieve_all_product")
+    public JAXBElement<RetrieveAllProduct> createRetrieveAllProduct(RetrieveAllProduct value) {
+        return new JAXBElement<RetrieveAllProduct>(_RetrieveAllProduct_QNAME, RetrieveAllProduct.class, null, value);
     }
 
     /**
@@ -491,39 +455,75 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RetrieveAllProduct }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link BuyResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "retrieve_all_product")
-    public JAXBElement<RetrieveAllProduct> createRetrieveAllProduct(RetrieveAllProduct value) {
-        return new JAXBElement<RetrieveAllProduct>(_RetrieveAllProduct_QNAME, RetrieveAllProduct.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "buyResponse")
+    public JAXBElement<BuyResponse> createBuyResponse(BuyResponse value) {
+        return new JAXBElement<BuyResponse>(_BuyResponse_QNAME, BuyResponse.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RetrieveAllProductResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link Purchase }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "retrieve_all_productResponse")
-    public JAXBElement<RetrieveAllProductResponse> createRetrieveAllProductResponse(RetrieveAllProductResponse value) {
-        return new JAXBElement<RetrieveAllProductResponse>(_RetrieveAllProductResponse_QNAME, RetrieveAllProductResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "Purchase")
+    public JAXBElement<Purchase> createPurchase(Purchase value) {
+        return new JAXBElement<Purchase>(_Purchase_QNAME, Purchase.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SearchProduct }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetPurchases }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "search_product")
-    public JAXBElement<SearchProduct> createSearchProduct(SearchProduct value) {
-        return new JAXBElement<SearchProduct>(_SearchProduct_QNAME, SearchProduct.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getPurchases")
+    public JAXBElement<GetPurchases> createGetPurchases(GetPurchases value) {
+        return new JAXBElement<GetPurchases>(_GetPurchases_QNAME, GetPurchases.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SearchProductResponse }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AddEditProductResponse }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "search_productResponse")
-    public JAXBElement<SearchProductResponse> createSearchProductResponse(SearchProductResponse value) {
-        return new JAXBElement<SearchProductResponse>(_SearchProductResponse_QNAME, SearchProductResponse.class, null, value);
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "add_edit_productResponse")
+    public JAXBElement<AddEditProductResponse> createAddEditProductResponse(AddEditProductResponse value) {
+        return new JAXBElement<AddEditProductResponse>(_AddEditProductResponse_QNAME, AddEditProductResponse.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteProduct }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "delete_product")
+    public JAXBElement<DeleteProduct> createDeleteProduct(DeleteProduct value) {
+        return new JAXBElement<DeleteProduct>(_DeleteProduct_QNAME, DeleteProduct.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link GetYourProductResponse }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "getYourProductResponse")
+    public JAXBElement<GetYourProductResponse> createGetYourProductResponse(GetYourProductResponse value) {
+        return new JAXBElement<GetYourProductResponse>(_GetYourProductResponse_QNAME, GetYourProductResponse.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AddEditProduct }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "add_edit_product")
+    public JAXBElement<AddEditProduct> createAddEditProduct(AddEditProduct value) {
+        return new JAXBElement<AddEditProduct>(_AddEditProduct_QNAME, AddEditProduct.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteProductResponse }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://Service.MarketPlaceService.KAA.org/", name = "delete_productResponse")
+    public JAXBElement<DeleteProductResponse> createDeleteProductResponse(DeleteProductResponse value) {
+        return new JAXBElement<DeleteProductResponse>(_DeleteProductResponse_QNAME, DeleteProductResponse.class, null, value);
     }
 
 }
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ProcedureStatus.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ProcedureStatus.java
index e920737593ae8a68e2b77ae0df692ac8b0fd4f9c..fcc16e2b4ba85674d4c26f233f3c8fd0f4da80e0 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ProcedureStatus.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ProcedureStatus.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="procedureStatus"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="status" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="procedureStatus">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="status" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ProcessLike.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ProcessLike.java
index 37c162c55f250029821beabcdfe1f5af81f3f4a4..64be4e72effef6fb4788e9b26db36f6673a036ac 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ProcessLike.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ProcessLike.java
@@ -13,17 +13,17 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="processLike"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="like" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="processLike">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="like" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ProcessLikeResponse.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ProcessLikeResponse.java
index 7bea8ec42131b48162b33621cfc3cefa217174f9..43caee418a12a27e2bba61a6d93664dc6603988a 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ProcessLikeResponse.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/ProcessLikeResponse.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="processLikeResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="processLikeResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="return" type="{http://Service.MarketPlaceService.KAA.org/}procedureStatus" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Product.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Product.java
index 047665e0473628d2c44744a6e443270f65938bb9..0270f0fe14f542516440435a23638bc3204a412f 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Product.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Product.java
@@ -13,23 +13,23 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="product"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="status_code" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="price" type="{http://www.w3.org/2001/XMLSchema}long"/&gt;
- *         &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="image" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="date" type="{http://Service.MarketPlaceService.KAA.org/}ts"/&gt;
- *         &lt;element name="user_id" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="username" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="product">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="status_code" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="price" type="{http://www.w3.org/2001/XMLSchema}long"/>
+ *         &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="image" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="date" type="{http://Service.MarketPlaceService.KAA.org/}ts"/>
+ *         &lt;element name="user_id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="username" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Purchase.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Purchase.java
index dfa8ba39aa4e3224aaddab79c576d309a5ae880a..f1caf3f4fb4ab0fc33f0f072b6b85bfa7467d421 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Purchase.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Purchase.java
@@ -13,27 +13,27 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="purchase"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="purchase_id" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="product_name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="product_price" type="{http://www.w3.org/2001/XMLSchema}long"/&gt;
- *         &lt;element name="quantity" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="product_image" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="seller_id" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="buyer_id" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="buyer_name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="buyer_address" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="postal_code" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="phonenumber" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="date" type="{http://Service.MarketPlaceService.KAA.org/}ts"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="purchase">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="purchase_id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="product_name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="product_price" type="{http://www.w3.org/2001/XMLSchema}long"/>
+ *         &lt;element name="quantity" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="product_image" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="seller_id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="buyer_id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="product_id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="buyer_name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="buyer_address" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="postal_code" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;element name="phonenumber" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="date" type="{http://Service.MarketPlaceService.KAA.org/}ts"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/RetrieveAllProduct.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/RetrieveAllProduct.java
index 2fd70d400f36828236bae4f3563b1c273a3e7234..568a8887c8ed793b1f1f1c45287670088f91d844 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/RetrieveAllProduct.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/RetrieveAllProduct.java
@@ -12,15 +12,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="retrieve_all_product"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="retrieve_all_product">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/RetrieveAllProductResponse.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/RetrieveAllProductResponse.java
index 82b6f5a7f0dada218a67652dbf846a8ff5a6c415..939fd5f833abe6f1ac3b9d09f0312fff53d75108 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/RetrieveAllProductResponse.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/RetrieveAllProductResponse.java
@@ -15,15 +15,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="retrieve_all_productResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="Product" type="{http://Service.MarketPlaceService.KAA.org/}product" maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="retrieve_all_productResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Product" type="{http://Service.MarketPlaceService.KAA.org/}product" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/SearchProduct.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/SearchProduct.java
index e97d887104b92decb8293df5e4b8499fc015ab25..ec654166e5f33d9f1dab7a9afd80b039cad12614 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/SearchProduct.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/SearchProduct.java
@@ -12,17 +12,17 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="search_product"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="query" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="choice" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="search_product">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="query" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="token" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="choice" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/SearchProductResponse.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/SearchProductResponse.java
index 5703b450663256bc43547ac5963b91da66cd7b70..65cc09a52a0945469cbbdf7f3087c470966207a5 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/SearchProductResponse.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/SearchProductResponse.java
@@ -15,15 +15,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="search_productResponse"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="Product" type="{http://Service.MarketPlaceService.KAA.org/}product" maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="search_productResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Product" type="{http://Service.MarketPlaceService.KAA.org/}product" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
diff --git a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Ts.java b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Ts.java
index 00ea2e8df96654a7857b120c3b5a5da37a88a5d8..27b78dde80b9189a1bdbf8a7fcddbc43ced7b93a 100644
--- a/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Ts.java
+++ b/KAA-JSP/build/generated/jax-wsCache/MarketPlaceService/org/kaa/marketplaceservice/service/Ts.java
@@ -13,15 +13,15 @@ import javax.xml.bind.annotation.XmlType;
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="ts"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="date" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
+ * &lt;complexType name="ts">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="date" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
  * </pre>
  * 
  * 
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/kaa/marketplaceservice/service/ObjectFactory.class b/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/ObjectFactory.class
index b1dbb36e93dd3ffd649214249f5290fda5a5b490..9a9fb578b0d6888992b376b9bffa18b516e32380 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/ObjectFactory.class and b/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/ObjectFactory.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..3434d5267af03308bd4d58eb37277222426b0842 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/catalog.jsp b/KAA-JSP/build/web/catalog.jsp
index 380103f5bbc3b873d7c8db4f4a1bd6426e06e0d3..eb78a4bc89fbb8448cb3c7245618e3bbe2fec46b 100644
--- a/KAA-JSP/build/web/catalog.jsp
+++ b/KAA-JSP/build/web/catalog.jsp
@@ -51,13 +51,6 @@
             <div class="information">
                 <span>
                     <%
-                        /*            FirebaseOptions options = new FirebaseOptions.Builder()
-                        .setServiceAccount(new FileInputStream("path/to/serviceAccountKey.json"))
-                        .setDatabaseUrl("https://<DATABASE_NAME>.firebaseio.com/")
-                        .build();
-
-                        FirebaseApp.initializeApp(options);*/
-
                         JSONObject responseJSON = new JSONObject();
                         JSONObject responseJSON1 = new JSONObject();
                         org.kaa.marketplaceservice.service.MarketPlaceService_Service service = new org.kaa.marketplaceservice.service.MarketPlaceService_Service();
diff --git a/KAA-JSP/build/web/login.jsp b/KAA-JSP/build/web/login.jsp
index 77d90a987d2e4a8940f861e7e2ccae9358f8f8dd..90300e56a2c1e9880784dd22c1a3751677a9ae09 100644
--- a/KAA-JSP/build/web/login.jsp
+++ b/KAA-JSP/build/web/login.jsp
@@ -17,11 +17,12 @@
                 /* Consuming API using GET method */
                 String user = request.getParameter("username");
                 String pass = request.getParameter("password");
-                String urlParameter = "username=" + user + "&password=" + pass;
                 String userAgent = request.getHeader("user-agent");
+                String urlParameter = "username=" + user + "&password=" + pass +
+                        "&user_agent=" + userAgent;
                 String urlRequest = "http://localhost:8080/IdentService/login?";
                 RestAPI_consumer consumer = new RestAPI_consumer(urlRequest, urlParameter);
-                consumer.execute();
+                consumer.executePost();
                 JSONObject responseJSON = consumer.getOutput();
 
                 // REST API for Chat Service
@@ -39,8 +40,6 @@
                 String status = (String) responseJSON.get("status");
                 String generatedToken = (String) responseJSON.get("token");
                 if (status.equals("OK")) {
-                    Cookie cookie = new Cookie("token", generatedToken);
-                    response.addCookie(cookie);
                     response.sendRedirect("http://localhost:8080/KAA-JSP/catalog."
                             + "jsp?token=" + generatedToken);
                 } else {
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 0a28249b62f62baa723f11b21959dc63d18c0b1c..0f610372d1078b944a0531ab173b5f245cad22ab 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\\Frys\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31137312071.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=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=C:\\Users\\Frys\\AppData\\Roaming\\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 e5c7c244aff3ed574731a292984a1615c6d7b0e1..72e673dee84b17c6ced52b70834f21025f07d56c 100644
--- a/KAA-JSP/nbproject/private/private.xml
+++ b/KAA-JSP/nbproject/private/private.xml
@@ -3,11 +3,10 @@
     <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/web/css/style.css</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/web/purchases.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/RestAPI_consumer.java</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/register.jsp</file>
         </group>
     </open-files>
 </project-private>
diff --git a/KAA-JSP/nbproject/project.properties b/KAA-JSP/nbproject/project.properties
index a4fc1810648a27a73268b61c96f72e7574d87041..cb7f9cad1d925e0f703d5b8ae981acbd6996ca75 100644
--- a/KAA-JSP/nbproject/project.properties
+++ b/KAA-JSP/nbproject/project.properties
@@ -36,13 +36,13 @@ j2ee.deploy.on.save=true
 j2ee.platform=1.7-web
 <<<<<<< HEAD
 =======
-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
 >>>>>>> 267a82ca7eed3c74c463cfce0a377e9ab1f0f69f
 <<<<<<< HEAD
 j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
 =======
 j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
 >>>>>>> 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.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/src/java/org/saleproject/KAA/RestAPI_consumer.java b/KAA-JSP/src/java/org/saleproject/KAA/RestAPI_consumer.java
index 3d81dba3f39a626f1b975bb9dce654d2f80335ab..c39b187f83e5338f2bdee6818c3c6d1f75330494 100644
--- a/KAA-JSP/src/java/org/saleproject/KAA/RestAPI_consumer.java
+++ b/KAA-JSP/src/java/org/saleproject/KAA/RestAPI_consumer.java
@@ -6,9 +6,13 @@
 package org.saleproject.KAA;
 
 import java.io.BufferedReader;
+import java.io.DataOutputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 
@@ -30,7 +34,7 @@ public class RestAPI_consumer {
     public void execute(){
         try{
             /* Consuming API using GET method */
-            String urlRequest = APIURL + URLParameter;
+            String urlRequest = APIURL + URLParameter.replace(" ", "%20");
             URL obj = new URL(urlRequest);
             HttpURLConnection con = (HttpURLConnection) obj.openConnection();
             BufferedReader br = new BufferedReader(new InputStreamReader((con.getInputStream())));
@@ -49,6 +53,33 @@ public class RestAPI_consumer {
         }
     }
     
+    public void executePost(){
+        try {
+            URL obj = new URL(APIURL);
+            HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+            con.setDoOutput( true );
+            con.setRequestMethod( "POST" );
+            DataOutputStream wr = new DataOutputStream(con.getOutputStream());
+            wr.writeBytes(URLParameter);
+            wr.flush();
+            wr.close();
+            con.setReadTimeout(15*1000);
+            con.connect();
+            BufferedReader br = new BufferedReader(new InputStreamReader((con.getInputStream())));
+            StringBuilder sb = new StringBuilder();
+            String output1;
+            while ((output1 = br.readLine()) != null) {
+                sb.append(output1);
+            }
+            
+            /* Parsing */
+            JSONParser parser = new JSONParser();
+            output = (JSONObject)parser.parse(sb.toString());
+        } catch(Exception e){
+            e.printStackTrace();
+        }
+}
+    
     public JSONObject getOutput(){
         return output;
     }
diff --git a/KAA-JSP/web/catalog.jsp b/KAA-JSP/web/catalog.jsp
index 380103f5bbc3b873d7c8db4f4a1bd6426e06e0d3..eb78a4bc89fbb8448cb3c7245618e3bbe2fec46b 100644
--- a/KAA-JSP/web/catalog.jsp
+++ b/KAA-JSP/web/catalog.jsp
@@ -51,13 +51,6 @@
             <div class="information">
                 <span>
                     <%
-                        /*            FirebaseOptions options = new FirebaseOptions.Builder()
-                        .setServiceAccount(new FileInputStream("path/to/serviceAccountKey.json"))
-                        .setDatabaseUrl("https://<DATABASE_NAME>.firebaseio.com/")
-                        .build();
-
-                        FirebaseApp.initializeApp(options);*/
-
                         JSONObject responseJSON = new JSONObject();
                         JSONObject responseJSON1 = new JSONObject();
                         org.kaa.marketplaceservice.service.MarketPlaceService_Service service = new org.kaa.marketplaceservice.service.MarketPlaceService_Service();
diff --git a/KAA-JSP/web/login.jsp b/KAA-JSP/web/login.jsp
index 77d90a987d2e4a8940f861e7e2ccae9358f8f8dd..90300e56a2c1e9880784dd22c1a3751677a9ae09 100644
--- a/KAA-JSP/web/login.jsp
+++ b/KAA-JSP/web/login.jsp
@@ -17,11 +17,12 @@
                 /* Consuming API using GET method */
                 String user = request.getParameter("username");
                 String pass = request.getParameter("password");
-                String urlParameter = "username=" + user + "&password=" + pass;
                 String userAgent = request.getHeader("user-agent");
+                String urlParameter = "username=" + user + "&password=" + pass +
+                        "&user_agent=" + userAgent;
                 String urlRequest = "http://localhost:8080/IdentService/login?";
                 RestAPI_consumer consumer = new RestAPI_consumer(urlRequest, urlParameter);
-                consumer.execute();
+                consumer.executePost();
                 JSONObject responseJSON = consumer.getOutput();
 
                 // REST API for Chat Service
@@ -39,8 +40,6 @@
                 String status = (String) responseJSON.get("status");
                 String generatedToken = (String) responseJSON.get("token");
                 if (status.equals("OK")) {
-                    Cookie cookie = new Cookie("token", generatedToken);
-                    response.addCookie(cookie);
                     response.sendRedirect("http://localhost:8080/KAA-JSP/catalog."
                             + "jsp?token=" + generatedToken);
                 } else {
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..d89dafe043b26783e2285ad1ee3edc910f8ea011 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 0a28249b62f62baa723f11b21959dc63d18c0b1c..0f610372d1078b944a0531ab173b5f245cad22ab 100644
--- a/MarketPlaceService/nbproject/private/private.properties
+++ b/MarketPlaceService/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=C:\\Users\\Frys\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31137312071.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=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=C:\\Users\\Frys\\AppData\\Roaming\\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/private/private.xml b/MarketPlaceService/nbproject/private/private.xml
index d0de6bf2a76b2b6e981d9449f846bffb0e31fb0f..95cf5e2255282de32ae9bf8eb75b4dd77925a9ee 100644
--- a/MarketPlaceService/nbproject/private/private.xml
+++ b/MarketPlaceService/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/MarketPlaceService/src/java/org/KAA/MarketPlaceService/Service/MarketPlaceService.java</file>
+            <file>file:/D:/Kuliah/IF%20ITB/Semester%205/Web%20Based%20Development/TugasBesar3_AngularJSandFirebase/MarketPlaceService/src/java/org/KAA/MarketPlaceService/Service/Validator.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/MarketPlaceService/nbproject/project.properties b/MarketPlaceService/nbproject/project.properties
index ad4b14ce72810af9cbe196640a8faa0653a30507..d134daaae1892f4c6e9489daa78a002a01fad878 100644
--- a/MarketPlaceService/nbproject/project.properties
+++ b/MarketPlaceService/nbproject/project.properties
@@ -36,13 +36,13 @@ j2ee.deploy.on.save=true
 j2ee.platform=1.7-web
 <<<<<<< HEAD
 =======
-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
 >>>>>>> 267a82ca7eed3c74c463cfce0a377e9ab1f0f69f
 <<<<<<< HEAD
 j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
 =======
 j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
 >>>>>>> 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.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/MarketPlaceService/src/java/org/KAA/MarketPlaceService/Service/Validator.java b/MarketPlaceService/src/java/org/KAA/MarketPlaceService/Service/Validator.java
index db012dd31d39611c16d7de4e3c8991dcdd21b2da..5b6370ac027200d184a450e4d8f51354e0934836 100644
--- a/MarketPlaceService/src/java/org/KAA/MarketPlaceService/Service/Validator.java
+++ b/MarketPlaceService/src/java/org/KAA/MarketPlaceService/Service/Validator.java
@@ -31,7 +31,7 @@ public class Validator {
             /* Validate token to the REST API */
             String urlParameter = "token="+token;
             String urlRequest = "http://localhost:8080/IdentService/validate?"+
-                    urlParameter;
+                    urlParameter.replace(" ","%20");
             URL obj = new URL(urlRequest);
             HttpURLConnection URLConnection = null;
             try {
@@ -81,7 +81,7 @@ public class Validator {
             /* Validate token to the REST API */
             String urlParameter = "token="+token;
             String urlRequest = "http://localhost:8080/IdentService/validate?"+
-                    urlParameter;
+                    urlParameter.replace(" ","%20");
             URL obj = new URL(urlRequest);
             HttpURLConnection URLConnection = null;
             try {
@@ -131,7 +131,7 @@ public class Validator {
             /* Validate token to the REST API */
             String urlParameter = "token="+token;
             String urlRequest = "http://localhost:8080/IdentService/validate?"+
-                    urlParameter;
+                    urlParameter.replace(" ","%20");
             URL obj = new URL(urlRequest);
             HttpURLConnection URLConnection = null;
             try {
@@ -181,7 +181,7 @@ public class Validator {
             /* Validate token to the REST API */
             String urlParameter = "token="+token;
             String urlRequest = "http://localhost:8080/IdentService/validate?"+
-                    urlParameter;
+                    urlParameter.replace(" ","%20");
             URL obj = new URL(urlRequest);
             HttpURLConnection URLConnection = null;
             try {