diff --git a/ChatService/nbproject/ant-deploy.xml b/ChatService/nbproject/ant-deploy.xml
index 2d5f8778d18757ea5ded4eea4da13ca1adc51093..5d33e0d6e743ce97b9b63e4c37346ab71071ce70 100644
--- a/ChatService/nbproject/ant-deploy.xml
+++ b/ChatService/nbproject/ant-deploy.xml
@@ -1,4 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License. When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+
+Contributor(s):
+-->
<project default="-deploy-ant" basedir=".">
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
@@ -8,7 +47,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
diff --git a/ChatService/nbproject/project.properties b/ChatService/nbproject/project.properties
index 4320c32a2bdfc01979bc28d7edf2c8ecacfa1cd1..4c3634ef88937e4e2ad04e8174646356e626d0b5 100644
--- a/ChatService/nbproject/project.properties
+++ b/ChatService/nbproject/project.properties
@@ -35,10 +35,10 @@ j2ee.copy.static.files.on.save=true
j2ee.deploy.on.save=true
j2ee.platform=1.7-web
<<<<<<< HEAD
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
=======
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
>>>>>>> 267a82ca7eed3c74c463cfce0a377e9ab1f0f69f
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/login.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/login.class
index 05f673c9bf8c2fc4c9429a689c3992917c40fc05..5371d1e459b9d919c2df7acf3a6c141b1e234a15 100644
Binary files a/IdentService/build/web/WEB-INF/classes/org/IdentService/login.class and b/IdentService/build/web/WEB-INF/classes/org/IdentService/login.class differ
diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/logout.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/logout.class
index 8b95b90309a2ccc042402b7db83fb16bf70fe44f..ccfd5e751d219473a8f2b67866bab4cb123998c6 100644
Binary files a/IdentService/build/web/WEB-INF/classes/org/IdentService/logout.class and b/IdentService/build/web/WEB-INF/classes/org/IdentService/logout.class differ
diff --git a/IdentService/nbproject/ant-deploy.xml b/IdentService/nbproject/ant-deploy.xml
index 2d5f8778d18757ea5ded4eea4da13ca1adc51093..5d33e0d6e743ce97b9b63e4c37346ab71071ce70 100644
--- a/IdentService/nbproject/ant-deploy.xml
+++ b/IdentService/nbproject/ant-deploy.xml
@@ -1,4 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License. When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+
+Contributor(s):
+-->
<project default="-deploy-ant" basedir=".">
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
@@ -8,7 +47,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
diff --git a/IdentService/nbproject/private/private.properties b/IdentService/nbproject/private/private.properties
index 0f610372d1078b944a0531ab173b5f245cad22ab..0a28249b62f62baa723f11b21959dc63d18c0b1c 100644
--- a/IdentService/nbproject/private/private.properties
+++ b/IdentService/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv3-445781616.properties
+deploy.ant.properties.file=C:\\Users\\Frys\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31137312071.properties
j2ee.platform.is.jsr109=true
-j2ee.server.domain=C:/Users/Ali-pc/AppData/Roaming/NetBeans/8.0.2/config/GF_4.1/domain1
-j2ee.server.home=C:/Program Files/glassfish-4.1/glassfish
-j2ee.server.instance=[C:\\Program Files\\glassfish-4.1\\glassfish;C:\\Program Files\\glassfish-4.1\\glassfish\\domains\\domain1]deployer:gfv3ee6:localhost:4848
-j2ee.server.middleware=C:/Program Files/glassfish-4.1
-user.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
+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
diff --git a/IdentService/nbproject/project.properties b/IdentService/nbproject/project.properties
index 2a6a47a1bf8d11cab03298571359c114f28ad586..b6af086fd9b4e3e4b60845a97090df11280e8312 100644
--- a/IdentService/nbproject/project.properties
+++ b/IdentService/nbproject/project.properties
@@ -35,10 +35,10 @@ j2ee.copy.static.files.on.save=true
j2ee.deploy.on.save=true
j2ee.platform=1.7-web
<<<<<<< HEAD
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
=======
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
>>>>>>> 267a82ca7eed3c74c463cfce0a377e9ab1f0f69f
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
diff --git a/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/MarketPlaceService_Service.class b/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/MarketPlaceService_Service.class
index 63ea6d742b8cd6f38440397c3d3fa52ec82cef67..6391415a9a3126e57cac65ed19b2fd2bb5f1ae8f 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/MarketPlaceService_Service.class and b/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/MarketPlaceService_Service.class differ
diff --git a/KAA-JSP/build/web/WEB-INF/classes/org/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/catalog.jsp b/KAA-JSP/build/web/catalog.jsp
index 0bba014676d93a65556830aada0cf368b2dd5f21..6ac153ae374604a711a6ca8fc5cff758924df130 100644
--- a/KAA-JSP/build/web/catalog.jsp
+++ b/KAA-JSP/build/web/catalog.jsp
@@ -324,7 +324,7 @@
}
}
%>
-
+
{{user}}
<br>
<div class="popup-box chat-popup" id="1" ng-show="isReceiverSet()" style="right: 0px; display: block;">
@@ -334,30 +334,38 @@
<div style="clear: both"></div>
</div>
<div class="popup-messages">
- <ul>
- <li ng-repeat="message in messages" style="list-style-type:none">
- <div class="chatbubble" ng-if="message.name===receiver" style="float:left">{{message.text}}</div>
- <div class="chatbubble" ng-if="message.name===user" style="float:right">{{message.text}}</div>
- </li>
+
+ <li ng-repeat="message in messages" style="list-style-type:none">
+ <div ng-if="message.name === receiver" class="talk-bubble tri-right left-top">
+ <div class="talktext">
+ <p>{{message.text}}</p>
+ </div>
+ </div>
+ <div ng-if="message.name === user" class="talk-bubble tri-right right-top">
+ <div class="talktext">
+ <p>{{message.text}}</p>
+ </div>
+ </div>
+ </li>
</div>
<div class="popup-input">
<input type="text" style="height: 100%; width:80%" name="chat" class="auto-style1" hidefocus="hidefocus" ng-model="newmessage"/>
<button ng-click="sendMessage()">Send</button>
</div>
</div>
-
-<!-- <div ng-app="chatApp" ng-controller="chatController">
- <p>Name: <input type="text" ng-model="newmessage.user"></p>
- <p>Message: <input type="text" ng-model="newmessage.text"></p>
- <button ng-click="insert(newmessage)">Send</button>
-
- <ul>
- <li ng-repeat="message in messages">
- {{message.user}} send: {{message.text}}
- </li>
- </ul>
- </div> -->
-
+
+ <!-- <div ng-app="chatApp" ng-controller="chatController">
+ <p>Name: <input type="text" ng-model="newmessage.user"></p>
+ <p>Message: <input type="text" ng-model="newmessage.text"></p>
+ <button ng-click="insert(newmessage)">Send</button>
+
+ <ul>
+ <li ng-repeat="message in messages">
+ {{message.user}} send: {{message.text}}
+ </li>
+ </ul>
+ </div> -->
+
<!-- <div ng-app="chatApp" ng-controller="chatController">
<p>Name: <input type="text" ng-model="newmessage.user"></p>
diff --git a/KAA-JSP/build/web/css/style.css b/KAA-JSP/build/web/css/style.css
index 5350b7a87048e7bc7870a57c1e2e10011348ebcb..c74554345918f145930a674aae47a5f02330989e 100644
--- a/KAA-JSP/build/web/css/style.css
+++ b/KAA-JSP/build/web/css/style.css
@@ -9,7 +9,7 @@
.chatbubble{
width:70%;
border:2px;
-
+
}
.popup-box
@@ -20,7 +20,7 @@
right: 220px;
height: 285px;
background-color: rgb(237, 239, 244);
- width: 300px;
+ width: 250px;
border: 1px solid rgba(29, 49, 91, .3);
}
@@ -63,203 +63,203 @@
}
body {
- align: center;
+ align: center;
}
.content {
margin: auto;
padding: 20px;
- width: 600px;
- font-family: calibri;
+ width: 600px;
+ font-family: calibri;
}
.catalog_content {
margin: auto;
padding: 20px;
- width: 60%;
- font-family: calibri;
+ width: 60%;
+ font-family: calibri;
}
.logo {
- text-align: center;
- font-size: 45px;
- font-weight: bold;
- padding-top: 30px;
- padding-bottom: 30px;
+ text-align: center;
+ font-size: 45px;
+ font-weight: bold;
+ padding-top: 30px;
+ padding-bottom: 30px;
}
.title {
- font-size: 30px;
- font-weight: bold;
+ font-size: 30px;
+ font-weight: bold;
}
.logout{
- font-weight: bold;
- color: #990000;
- text-transform: lowercase;
+ font-weight: bold;
+ color: #990000;
+ text-transform: lowercase;
}
table {
- width: 100%;
+ width: 100%;
}
th, td {
- vertical-align: top;
- padding: 0px;
+ vertical-align: top;
+ padding: 0px;
text-align: left;
}
td.product_description {
- padding-left: 20px;
- width: 80%;
- height: 75%;
+ padding-left: 20px;
+ width: 80%;
+ height: 75%;
}
td.product_misc {
- width: 30%;
+ width: 30%;
}
p#like {
- font-weight: bold;
- color: #3ca1c3;
- font-size: 25px;
+ font-weight: bold;
+ color: #3ca1c3;
+ font-size: 25px;
}
p#liked {
- font-weight: bold;
- color: #ff0000;
- font-size: 25px;
+ font-weight: bold;
+ color: #ff0000;
+ font-size: 25px;
}
p#buy {
- font-weight: bold;
- color: #008000;
- padding-left: 10px;
- font-size: 25px;
+ font-weight: bold;
+ color: #008000;
+ padding-left: 10px;
+ font-size: 25px;
}
p#delete{
- font-weight: 900;
- color: #990000;
- padding-left: 10px;
- font-size: 20px;
+ font-weight: 900;
+ color: #990000;
+ padding-left: 10px;
+ font-size: 20px;
}
p#edit{
- font-weight: 900;
- color: #cccc00;
- font-size: 20px;
+ font-weight: 900;
+ color: #cccc00;
+ font-size: 20px;
}
td {
}
img {
- border: solid 2px gray;
- padding: 5px;
+ border: solid 2px gray;
+ padding: 5px;
}
p{
- display: inline;
- margin: 0px;
+ display: inline;
+ margin: 0px;
}
p.catalog_title {
- font-size: 25px;
- font-weight: bold;
+ font-size: 25px;
+ font-weight: bold;
}
p.catalog_price {
- font-size: 25px;
+ font-size: 25px;
}
p.catalog_desc {
- font-size: 20px;
+ font-size: 20px;
}
.information{
- margin-left: 500px;
- font-size : 15px;
- font-family: calibri;
- text-align: right;
- padding: 20px;
+ margin-left: 500px;
+ font-size : 15px;
+ font-family: calibri;
+ text-align: right;
+ padding: 20px;
}
.register {
- font-weight: bold;
- color: #3ca1c3;
+ font-weight: bold;
+ color: #3ca1c3;
}
.radio {
- padding-left: 20%;
+ padding-left: 20%;
}
.menu{
- margin: auto;
- width: 100%;
- border: 2px solid black;
- border-collapse: collapse;
- font-size: 20px;
- text-align: center;
- margin-right: 200px;
- padding : 5px;
+ margin: auto;
+ width: 100%;
+ border: 2px solid black;
+ border-collapse: collapse;
+ font-size: 20px;
+ text-align: center;
+ margin-right: 200px;
+ padding : 5px;
}
.menupart{
- margin: auto;
- width: 20%;
- border: 2px solid black;
- border-collapse: collapse;
- font-size: 20px;
- text-align: center;
- margin-right: 200px;
- padding : 5px;
- color: black;
+ margin: auto;
+ width: 20%;
+ border: 2px solid black;
+ border-collapse: collapse;
+ font-size: 20px;
+ text-align: center;
+ margin-right: 200px;
+ padding : 5px;
+ color: black;
}
.tab{
- padding-left: 2em;
+ padding-left: 2em;
}
#red {
- color: #cc0000;
+ color: #cc0000;
}
#blue {
- color: #1a75ff;
+ color: #1a75ff;
}
#here{
- color: #4d79ff;
+ color: #4d79ff;
}
#add_product_title{
- font-size: 40px;
- border-bottom: 1px solid black;
+ font-size: 40px;
+ border-bottom: 1px solid black;
}
#add_cancel_button{
- margin-left: 80%;
+ margin-left: 80%;
}
.input_field {
- padding-top: 10px;
- padding-bottom: 10px;
+ padding-top: 10px;
+ padding-bottom: 10px;
}
.input_catalog {
- padding-top: 10px;
- padding-bottom: 10px;
- outline: none;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ outline: none;
}
.input_field {
- padding-top: 10px;
- padding-bottom: 10px;
+ padding-top: 10px;
+ padding-bottom: 10px;
}
input[type=text].quantity {
- width: 30%;
+ width: 30%;
}
input[type=text], input[type=email], input[type=password], input[type=number], input[type=textarea]{
@@ -267,7 +267,7 @@ input[type=text], input[type=email], input[type=password], input[type=number], i
padding: 8px 8px;
margin: 0px 0px 4px 0px;
box-sizing: border-box;
- autocomplete: off;
+ autocomplete: off;
}
textarea {
@@ -278,82 +278,113 @@ textarea {
}
input[type=submit] {
- background-color: #4d79ff;
- margin-top: 10px;
- color: white;
- border: none;
- width: 100px;
- height: 30px;
+ background-color: #4d79ff;
+ margin-top: 10px;
+ color: white;
+ border: none;
+ width: 100px;
+ height: 30px;
}
input[type=reset] {
- background-color: #4d79ff;
- margin-top: 10px;
- color: white;
- border: none;
- width: 100px;
- height: 30px;
+ background-color: #4d79ff;
+ margin-top: 10px;
+ color: white;
+ border: none;
+ width: 100px;
+ height: 30px;
}
textarea {
- resize: none;
+ resize: none;
}
.submit_button_add {
- padding-left: 81%;
- display: inline;
- width: 100%;
+ padding-left: 81%;
+ display: inline;
+ width: 100%;
}
.submit_button_cancel {
- padding-left: 1.5%;
- display: inline;
- width: 100%;
+ padding-left: 1.5%;
+ display: inline;
+ width: 100%;
}
a {
- text-decoration: none;
- color: inherit;
+ text-decoration: none;
+ color: inherit;
}
#active {
- background-color : #0066ff;
- color : #ffffff;
+ background-color : #0066ff;
+ color : #ffffff;
}
.flex-text-container{
- display: -webkit-flex;
- display: flex;
- width: 90%;
+ display: -webkit-flex;
+ display: flex;
+ width: 90%;
}
.flex-text-box{
- width: 20%;
+ width: 20%;
}
.container {
- height: 150px;
+ height: 150px;
}
.link{
- color: #1a53ff;
-}
-
-ul {
- margin: 0px 0px 0px 20px;
- padding: 0px 0px 0px 10px;
-}
-
-ul li .on {
- color: green;
- list-style-type: disc;
-}
-
-ul li .off {
- color: gray;
- list-style-type: disc;
+ color: #1a53ff;
+}
+
+/* CSS talk bubble */
+.talk-bubble {
+ margin: 5px 20px;
+ display: inline-block;
+ position: relative;
+ width: 200px;
+ height: auto;
+ background-color: lightblue;
+}
+
+.tri-right.left-top:after{
+ content: ' ';
+ position: absolute;
+ width: 0;
+ height: 0;
+ left: -20px;
+ right: auto;
+ top: 0px;
+ bottom: auto;
+ border: 22px solid;
+ border-color: lightblue transparent transparent transparent;
+}
+
+
+.tri-right.right-top:after{
+ content: ' ';
+ position: absolute;
+ width: 0;
+ height: 0;
+ left: auto;
+ right: -20px;
+ top: 0px;
+ bottom: auto;
+ border: 20px solid;
+ border-color: lightblue transparent transparent transparent;
+}
+
+/* talk bubble contents */
+.talktext{
+ padding: 1em;
+ text-align: left;
+ line-height: 1.5em;
}
-ul li span{
- color: black;
+.talktext p{
+ /* remove webkit p margins */
+ -webkit-margin-before: 0em;
+ -webkit-margin-after: 0em;
}
\ No newline at end of file
diff --git a/KAA-JSP/nbproject/ant-deploy.xml b/KAA-JSP/nbproject/ant-deploy.xml
index 2d5f8778d18757ea5ded4eea4da13ca1adc51093..5d33e0d6e743ce97b9b63e4c37346ab71071ce70 100644
--- a/KAA-JSP/nbproject/ant-deploy.xml
+++ b/KAA-JSP/nbproject/ant-deploy.xml
@@ -1,4 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License. When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+
+Contributor(s):
+-->
<project default="-deploy-ant" basedir=".">
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
@@ -8,7 +47,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
diff --git a/KAA-JSP/nbproject/private/private.properties b/KAA-JSP/nbproject/private/private.properties
index 0f610372d1078b944a0531ab173b5f245cad22ab..0a28249b62f62baa723f11b21959dc63d18c0b1c 100644
--- a/KAA-JSP/nbproject/private/private.properties
+++ b/KAA-JSP/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv3-445781616.properties
+deploy.ant.properties.file=C:\\Users\\Frys\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31137312071.properties
j2ee.platform.is.jsr109=true
-j2ee.server.domain=C:/Users/Ali-pc/AppData/Roaming/NetBeans/8.0.2/config/GF_4.1/domain1
-j2ee.server.home=C:/Program Files/glassfish-4.1/glassfish
-j2ee.server.instance=[C:\\Program Files\\glassfish-4.1\\glassfish;C:\\Program Files\\glassfish-4.1\\glassfish\\domains\\domain1]deployer:gfv3ee6:localhost:4848
-j2ee.server.middleware=C:/Program Files/glassfish-4.1
-user.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
+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
diff --git a/KAA-JSP/nbproject/project.properties b/KAA-JSP/nbproject/project.properties
index 0a43f8b38c5f771737f8578184d00bff726c20f7..dcecdda6dd6a3078f0a39b00f009c687730381ad 100644
--- a/KAA-JSP/nbproject/project.properties
+++ b/KAA-JSP/nbproject/project.properties
@@ -35,10 +35,10 @@ j2ee.copy.static.files.on.save=true
j2ee.deploy.on.save=true
j2ee.platform=1.7-web
<<<<<<< HEAD
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
=======
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
>>>>>>> 267a82ca7eed3c74c463cfce0a377e9ab1f0f69f
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
diff --git a/KAA-JSP/web/catalog.jsp b/KAA-JSP/web/catalog.jsp
index 0bba014676d93a65556830aada0cf368b2dd5f21..6ac153ae374604a711a6ca8fc5cff758924df130 100644
--- a/KAA-JSP/web/catalog.jsp
+++ b/KAA-JSP/web/catalog.jsp
@@ -324,7 +324,7 @@
}
}
%>
-
+
{{user}}
<br>
<div class="popup-box chat-popup" id="1" ng-show="isReceiverSet()" style="right: 0px; display: block;">
@@ -334,30 +334,38 @@
<div style="clear: both"></div>
</div>
<div class="popup-messages">
- <ul>
- <li ng-repeat="message in messages" style="list-style-type:none">
- <div class="chatbubble" ng-if="message.name===receiver" style="float:left">{{message.text}}</div>
- <div class="chatbubble" ng-if="message.name===user" style="float:right">{{message.text}}</div>
- </li>
+
+ <li ng-repeat="message in messages" style="list-style-type:none">
+ <div ng-if="message.name === receiver" class="talk-bubble tri-right left-top">
+ <div class="talktext">
+ <p>{{message.text}}</p>
+ </div>
+ </div>
+ <div ng-if="message.name === user" class="talk-bubble tri-right right-top">
+ <div class="talktext">
+ <p>{{message.text}}</p>
+ </div>
+ </div>
+ </li>
</div>
<div class="popup-input">
<input type="text" style="height: 100%; width:80%" name="chat" class="auto-style1" hidefocus="hidefocus" ng-model="newmessage"/>
<button ng-click="sendMessage()">Send</button>
</div>
</div>
-
-<!-- <div ng-app="chatApp" ng-controller="chatController">
- <p>Name: <input type="text" ng-model="newmessage.user"></p>
- <p>Message: <input type="text" ng-model="newmessage.text"></p>
- <button ng-click="insert(newmessage)">Send</button>
-
- <ul>
- <li ng-repeat="message in messages">
- {{message.user}} send: {{message.text}}
- </li>
- </ul>
- </div> -->
-
+
+ <!-- <div ng-app="chatApp" ng-controller="chatController">
+ <p>Name: <input type="text" ng-model="newmessage.user"></p>
+ <p>Message: <input type="text" ng-model="newmessage.text"></p>
+ <button ng-click="insert(newmessage)">Send</button>
+
+ <ul>
+ <li ng-repeat="message in messages">
+ {{message.user}} send: {{message.text}}
+ </li>
+ </ul>
+ </div> -->
+
<!-- <div ng-app="chatApp" ng-controller="chatController">
<p>Name: <input type="text" ng-model="newmessage.user"></p>
diff --git a/KAA-JSP/web/css/style.css b/KAA-JSP/web/css/style.css
index 5350b7a87048e7bc7870a57c1e2e10011348ebcb..c74554345918f145930a674aae47a5f02330989e 100644
--- a/KAA-JSP/web/css/style.css
+++ b/KAA-JSP/web/css/style.css
@@ -9,7 +9,7 @@
.chatbubble{
width:70%;
border:2px;
-
+
}
.popup-box
@@ -20,7 +20,7 @@
right: 220px;
height: 285px;
background-color: rgb(237, 239, 244);
- width: 300px;
+ width: 250px;
border: 1px solid rgba(29, 49, 91, .3);
}
@@ -63,203 +63,203 @@
}
body {
- align: center;
+ align: center;
}
.content {
margin: auto;
padding: 20px;
- width: 600px;
- font-family: calibri;
+ width: 600px;
+ font-family: calibri;
}
.catalog_content {
margin: auto;
padding: 20px;
- width: 60%;
- font-family: calibri;
+ width: 60%;
+ font-family: calibri;
}
.logo {
- text-align: center;
- font-size: 45px;
- font-weight: bold;
- padding-top: 30px;
- padding-bottom: 30px;
+ text-align: center;
+ font-size: 45px;
+ font-weight: bold;
+ padding-top: 30px;
+ padding-bottom: 30px;
}
.title {
- font-size: 30px;
- font-weight: bold;
+ font-size: 30px;
+ font-weight: bold;
}
.logout{
- font-weight: bold;
- color: #990000;
- text-transform: lowercase;
+ font-weight: bold;
+ color: #990000;
+ text-transform: lowercase;
}
table {
- width: 100%;
+ width: 100%;
}
th, td {
- vertical-align: top;
- padding: 0px;
+ vertical-align: top;
+ padding: 0px;
text-align: left;
}
td.product_description {
- padding-left: 20px;
- width: 80%;
- height: 75%;
+ padding-left: 20px;
+ width: 80%;
+ height: 75%;
}
td.product_misc {
- width: 30%;
+ width: 30%;
}
p#like {
- font-weight: bold;
- color: #3ca1c3;
- font-size: 25px;
+ font-weight: bold;
+ color: #3ca1c3;
+ font-size: 25px;
}
p#liked {
- font-weight: bold;
- color: #ff0000;
- font-size: 25px;
+ font-weight: bold;
+ color: #ff0000;
+ font-size: 25px;
}
p#buy {
- font-weight: bold;
- color: #008000;
- padding-left: 10px;
- font-size: 25px;
+ font-weight: bold;
+ color: #008000;
+ padding-left: 10px;
+ font-size: 25px;
}
p#delete{
- font-weight: 900;
- color: #990000;
- padding-left: 10px;
- font-size: 20px;
+ font-weight: 900;
+ color: #990000;
+ padding-left: 10px;
+ font-size: 20px;
}
p#edit{
- font-weight: 900;
- color: #cccc00;
- font-size: 20px;
+ font-weight: 900;
+ color: #cccc00;
+ font-size: 20px;
}
td {
}
img {
- border: solid 2px gray;
- padding: 5px;
+ border: solid 2px gray;
+ padding: 5px;
}
p{
- display: inline;
- margin: 0px;
+ display: inline;
+ margin: 0px;
}
p.catalog_title {
- font-size: 25px;
- font-weight: bold;
+ font-size: 25px;
+ font-weight: bold;
}
p.catalog_price {
- font-size: 25px;
+ font-size: 25px;
}
p.catalog_desc {
- font-size: 20px;
+ font-size: 20px;
}
.information{
- margin-left: 500px;
- font-size : 15px;
- font-family: calibri;
- text-align: right;
- padding: 20px;
+ margin-left: 500px;
+ font-size : 15px;
+ font-family: calibri;
+ text-align: right;
+ padding: 20px;
}
.register {
- font-weight: bold;
- color: #3ca1c3;
+ font-weight: bold;
+ color: #3ca1c3;
}
.radio {
- padding-left: 20%;
+ padding-left: 20%;
}
.menu{
- margin: auto;
- width: 100%;
- border: 2px solid black;
- border-collapse: collapse;
- font-size: 20px;
- text-align: center;
- margin-right: 200px;
- padding : 5px;
+ margin: auto;
+ width: 100%;
+ border: 2px solid black;
+ border-collapse: collapse;
+ font-size: 20px;
+ text-align: center;
+ margin-right: 200px;
+ padding : 5px;
}
.menupart{
- margin: auto;
- width: 20%;
- border: 2px solid black;
- border-collapse: collapse;
- font-size: 20px;
- text-align: center;
- margin-right: 200px;
- padding : 5px;
- color: black;
+ margin: auto;
+ width: 20%;
+ border: 2px solid black;
+ border-collapse: collapse;
+ font-size: 20px;
+ text-align: center;
+ margin-right: 200px;
+ padding : 5px;
+ color: black;
}
.tab{
- padding-left: 2em;
+ padding-left: 2em;
}
#red {
- color: #cc0000;
+ color: #cc0000;
}
#blue {
- color: #1a75ff;
+ color: #1a75ff;
}
#here{
- color: #4d79ff;
+ color: #4d79ff;
}
#add_product_title{
- font-size: 40px;
- border-bottom: 1px solid black;
+ font-size: 40px;
+ border-bottom: 1px solid black;
}
#add_cancel_button{
- margin-left: 80%;
+ margin-left: 80%;
}
.input_field {
- padding-top: 10px;
- padding-bottom: 10px;
+ padding-top: 10px;
+ padding-bottom: 10px;
}
.input_catalog {
- padding-top: 10px;
- padding-bottom: 10px;
- outline: none;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ outline: none;
}
.input_field {
- padding-top: 10px;
- padding-bottom: 10px;
+ padding-top: 10px;
+ padding-bottom: 10px;
}
input[type=text].quantity {
- width: 30%;
+ width: 30%;
}
input[type=text], input[type=email], input[type=password], input[type=number], input[type=textarea]{
@@ -267,7 +267,7 @@ input[type=text], input[type=email], input[type=password], input[type=number], i
padding: 8px 8px;
margin: 0px 0px 4px 0px;
box-sizing: border-box;
- autocomplete: off;
+ autocomplete: off;
}
textarea {
@@ -278,82 +278,113 @@ textarea {
}
input[type=submit] {
- background-color: #4d79ff;
- margin-top: 10px;
- color: white;
- border: none;
- width: 100px;
- height: 30px;
+ background-color: #4d79ff;
+ margin-top: 10px;
+ color: white;
+ border: none;
+ width: 100px;
+ height: 30px;
}
input[type=reset] {
- background-color: #4d79ff;
- margin-top: 10px;
- color: white;
- border: none;
- width: 100px;
- height: 30px;
+ background-color: #4d79ff;
+ margin-top: 10px;
+ color: white;
+ border: none;
+ width: 100px;
+ height: 30px;
}
textarea {
- resize: none;
+ resize: none;
}
.submit_button_add {
- padding-left: 81%;
- display: inline;
- width: 100%;
+ padding-left: 81%;
+ display: inline;
+ width: 100%;
}
.submit_button_cancel {
- padding-left: 1.5%;
- display: inline;
- width: 100%;
+ padding-left: 1.5%;
+ display: inline;
+ width: 100%;
}
a {
- text-decoration: none;
- color: inherit;
+ text-decoration: none;
+ color: inherit;
}
#active {
- background-color : #0066ff;
- color : #ffffff;
+ background-color : #0066ff;
+ color : #ffffff;
}
.flex-text-container{
- display: -webkit-flex;
- display: flex;
- width: 90%;
+ display: -webkit-flex;
+ display: flex;
+ width: 90%;
}
.flex-text-box{
- width: 20%;
+ width: 20%;
}
.container {
- height: 150px;
+ height: 150px;
}
.link{
- color: #1a53ff;
-}
-
-ul {
- margin: 0px 0px 0px 20px;
- padding: 0px 0px 0px 10px;
-}
-
-ul li .on {
- color: green;
- list-style-type: disc;
-}
-
-ul li .off {
- color: gray;
- list-style-type: disc;
+ color: #1a53ff;
+}
+
+/* CSS talk bubble */
+.talk-bubble {
+ margin: 5px 20px;
+ display: inline-block;
+ position: relative;
+ width: 200px;
+ height: auto;
+ background-color: lightblue;
+}
+
+.tri-right.left-top:after{
+ content: ' ';
+ position: absolute;
+ width: 0;
+ height: 0;
+ left: -20px;
+ right: auto;
+ top: 0px;
+ bottom: auto;
+ border: 22px solid;
+ border-color: lightblue transparent transparent transparent;
+}
+
+
+.tri-right.right-top:after{
+ content: ' ';
+ position: absolute;
+ width: 0;
+ height: 0;
+ left: auto;
+ right: -20px;
+ top: 0px;
+ bottom: auto;
+ border: 20px solid;
+ border-color: lightblue transparent transparent transparent;
+}
+
+/* talk bubble contents */
+.talktext{
+ padding: 1em;
+ text-align: left;
+ line-height: 1.5em;
}
-ul li span{
- color: black;
+.talktext p{
+ /* remove webkit p margins */
+ -webkit-margin-before: 0em;
+ -webkit-margin-after: 0em;
}
\ No newline at end of file
diff --git a/MarketPlaceService/nbproject/ant-deploy.xml b/MarketPlaceService/nbproject/ant-deploy.xml
index 2d5f8778d18757ea5ded4eea4da13ca1adc51093..5d33e0d6e743ce97b9b63e4c37346ab71071ce70 100644
--- a/MarketPlaceService/nbproject/ant-deploy.xml
+++ b/MarketPlaceService/nbproject/ant-deploy.xml
@@ -1,4 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License. When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+
+Contributor(s):
+-->
<project default="-deploy-ant" basedir=".">
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
@@ -8,7 +47,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
diff --git a/MarketPlaceService/nbproject/private/private.properties b/MarketPlaceService/nbproject/private/private.properties
index 0f610372d1078b944a0531ab173b5f245cad22ab..0a28249b62f62baa723f11b21959dc63d18c0b1c 100644
--- a/MarketPlaceService/nbproject/private/private.properties
+++ b/MarketPlaceService/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv3-445781616.properties
+deploy.ant.properties.file=C:\\Users\\Frys\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31137312071.properties
j2ee.platform.is.jsr109=true
-j2ee.server.domain=C:/Users/Ali-pc/AppData/Roaming/NetBeans/8.0.2/config/GF_4.1/domain1
-j2ee.server.home=C:/Program Files/glassfish-4.1/glassfish
-j2ee.server.instance=[C:\\Program Files\\glassfish-4.1\\glassfish;C:\\Program Files\\glassfish-4.1\\glassfish\\domains\\domain1]deployer:gfv3ee6:localhost:4848
-j2ee.server.middleware=C:/Program Files/glassfish-4.1
-user.properties.file=C:\\Users\\Ali-pc\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
+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
diff --git a/MarketPlaceService/nbproject/project.properties b/MarketPlaceService/nbproject/project.properties
index 76875b1cc29c36b193b4e6288b859c7b1cee90f1..2854b664d8d566f6e050e129b2d025c5e8c41a59 100644
--- a/MarketPlaceService/nbproject/project.properties
+++ b/MarketPlaceService/nbproject/project.properties
@@ -35,10 +35,10 @@ j2ee.copy.static.files.on.save=true
j2ee.deploy.on.save=true
j2ee.platform=1.7-web
<<<<<<< HEAD
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
=======
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
>>>>>>> 267a82ca7eed3c74c463cfce0a377e9ab1f0f69f
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar