From 6a807d51490308831da1c101b3d346b4389be5c7 Mon Sep 17 00:00:00 2001
From: azkahi <azkaimtiyaz@gmail.com>
Date: Wed, 30 Nov 2016 13:57:43 +0800
Subject: [PATCH] Added chat bubbles
---
ChatService/nbproject/ant-deploy.xml | 41 ++-
ChatService/nbproject/project.properties | 2 +-
.../classes/org/IdentService/login.class | Bin 6796 -> 6760 bytes
.../classes/org/IdentService/logout.class | Bin 4712 -> 4685 bytes
IdentService/nbproject/ant-deploy.xml | 41 ++-
.../nbproject/private/private.properties | 12 +-
IdentService/nbproject/project.properties | 2 +-
.../service/MarketPlaceService_Service.class | Bin 2973 -> 2964 bytes
.../service/ObjectFactory.class | Bin 19338 -> 19338 bytes
KAA-JSP/build/web/catalog.jsp | 46 +--
KAA-JSP/build/web/css/style.css | 303 ++++++++++--------
KAA-JSP/nbproject/ant-deploy.xml | 41 ++-
KAA-JSP/nbproject/private/private.properties | 12 +-
KAA-JSP/nbproject/project.properties | 2 +-
KAA-JSP/web/catalog.jsp | 46 +--
KAA-JSP/web/css/style.css | 303 ++++++++++--------
MarketPlaceService/nbproject/ant-deploy.xml | 41 ++-
.../nbproject/private/private.properties | 12 +-
.../nbproject/project.properties | 2 +-
19 files changed, 570 insertions(+), 336 deletions(-)
diff --git a/ChatService/nbproject/ant-deploy.xml b/ChatService/nbproject/ant-deploy.xml
index 2d5f877..5d33e0d 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 4320c32..4c3634e 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
GIT binary patch
delta 1544
zcmaJ>d0bRg6#l-MVeXwbS4YrT102*AlSWcZ6Ezi7T3iY%(fa+!FhoU-Q7|>q!m`ZD
z*Ji0@BxM^FEoNnAw%KC4Z7waArR`R>F`a8ViGTEd@16aed+vAceT(vU^{m^}vUVMS
zo;=UN1T-l;<iLZ611QEL8qGn>!K0Qurt!Fgxp+cjjmDE2Yc-zIcv|5Z2O%_Rth4;t
zAZBB|#&cHLpz*xMMw|A6!ix^l@RG*M8n4)jn-pGk>X3yd2e0AvAeP|`jU~3gW(`;4
zO^vrS-qv_0h~;=Uh!uEGW4`6@Te8JL1Rp4TX!%E$d~C@l3R@j)!*&Nfu*2@=Q!9xY
z!e<(vTmFT{PRqZn)A-6(-=*=j#y5_%vs<Il!5(~Tl?}G}?=-&G_(9=Eg`XV!jJ*zi
z!LI@QhJ9B0-4V3@(D+m1FWdg#R&UXW$r6M>NjfN{N7HM$Phyy$=+{(XO|2QwbTosS
zMzf7(Tg{MWJIzGJq~;Y|!wj}p?4WoA;S|-5FP|2jIJK%;F<CLCxyD;Y%~ZuS#q{Pq
zz9J6HFt`vEL`t;0HX5mjPMO?yd_~zs)#cHCqf3V5_BK3{nTA=+CPD?_!V!Z@#*8fL
zXaoBjc4Veo>#yw=W{zPeG!O{|k%~O=bhe5rh@3z5f?56dO9xWAxY;V*dlZj$3sk1}
z7%4DLWw$%luq%%<?8aQf;~8-mt5Io&-I-^20(%(tWWHf9Mhs76Z?{FI^y$Ns4EwUc
zupecGq{_0HWs&OXlOrV)r<7Mm%ce|I9AKR%8%*Lr!$D{;40EtMTzBjpW+CCt=_Y-L
zSwwhpq=g~OC;XBdolz~O5vLjs<uJu!!&4~AY0_<@9+P#t;czr4jxZd_QHp06p2-r!
z(LBpwo|_ry5;<F1#cHe~*vT$&j=@A!8jfM9pfRIrQq|O&D#NiHXLv3enx_Z0>C$3_
z*$Q(M<|?@X6cQXFWSD$0Btj{)j)+HjV{&-CakpI4OXTy5u@0BQhk4DblNNf5=i@Rs
zSc;vv9QCj_V+R)C3K-mtEx1y=ZP0|xSSV6kY{g1kg{$T8?}m#-xCZU8S1gNB@6Jxn
zD83fgApup)#r0Cnk9<zR5|I=JaGYe+Lt_?ma06~cfQ_<l6f-0v)02ana5H?KLfO<U
zSn6(1?oxLvZi5#WOWRu!ieV!{@$D#NDJ)Z1u26dLT_Na*5+Q-a819Ah|KUJPAWb+d
z2=K%()&g4>NA};f{+qzi_ypRc!(sUcCM8WDeBvYV*^&4TjRyuP3`=S?n%gDM58@8L
z2tKTIb!tiGp|gtzh@ZF<4eqSeUWu)(cVU&gK6OEMqd@MFzesl(XT5+KLRZ`)l22@M
y6y5T)`aG*ApglSZWYz-|VkT;YTj<-u+k$|?ePr%FiPN~>%}B3Q4~Wl$2mb-7r77b8
delta 1598
zcmaJ>XLwXa6g_8mvorg4AS9th4Ji<j5*DP05`!TLML|G=N>N!Lkc7BFNGP^Ns!^;D
ztQf@t2CzmHL9t;26$>^LY@jH1QNWVrPLNgj;ePvWn|tq^Irq)m-D6SD=%$8s8vyiR
zxr2#Vqws_S51tHQ5Y}ou6~sEMx8iAyXB=$6vl`E7Jg@PB#)}#o6<%_Xh&387Tm4E9
zui`b0P1f10@w&zvw(L!XEe=xgmd4u}@7Rv-Dr|M4XoEEl-oyJre1H!%7TX3NX)Mv$
zrtz`HCmP#>*nv-j_za(G%(MCnE539P!cK)<R)1y1*H-LS_{PDv*yEr(zO$$K-df@&
z;s=c%t^P^lXRCjSYW!-u@74HC<9A2k?9*87U_TC6XR`(WhsK{8e<}Q}(BL3OI3zs*
zdg-%Pf`dWyYbs4G@ENeaqZyPfXoN~OaWINaH509FW^<AhlQmN^HJfX;&}^yMO0%_Q
zs^&48$7&v@nWosLzLsm5i3Y`V#SFzvVNw7T%^Y7crK+qlGEFf{v2Fdu-Y}bEt71FF
zY-z4|yig;U>$mxe$o6iAKfS$lFg$@B3_G$Dk(irVIJBU6<glWQ(yEIp@}#?AXLfMM
z`ezQ#VHercFoZfHAvaXoEzhv4byRL>T;+sWd5u<Mp<y>v5Gm#1>ETdCI5H_zTspOK
zMtEFBiQ$Rt?q;eqZx3mluhLU`8usEz0@ScKPc}S-ecUN(c!A(H%;l+q+%S)Q4Nqgf
zVL$dUEMOs#+}OUls;nYZ5UwbRObAakEMkAd0UT&Jh^M;^s#S|KtU1_VGKUzRi8{j^
z4s|=~jNUmMMtHM2XW7tj!jmOToW*>?KdmZURXt5YL#6y|7AuZ0Jcs8Ro+q&9=#gzk
z8jeDp;%LJ$JYVqw!wWgqFwAiVbKL_vJ2YOP;$f^J*w$__!JrJ~h9#URTvbOVM=EDT
z3@5SFuncweLjpVWs7n<tQ@C8=3WX>rBG_NVKzU+Ff>Jm#BcA1r$-C{1FUu{SEstM<
zS7Hu)m|H(TxyBovhxu@D8+Ks<79xmRxjI*&1_mqS%3Uq1O$756Tq9OfY{xPz!nJZY
z_Q1t;xE{^0SF&!9+9YAKE2>b9WY!?L(Q?p<Q*a}0LINVpk(z}9p(iI|u~-UyyKoGa
zh^aA)S-2UuAi(7U$F@m8nkNglis$nb%2{v69q#&;+0muA6JA^*r`e9g7&am?eoBQ}
zg}W5)R#<lUe~*wR&b=g%6vIk5|DO)T<WrPzR1)BcVYKBt8YleFUjGheKzuMMXns`v
zKLZrdhkx-&`Rt^8|IG*bDcqNQ#Ki8GIzNczeldJl;qGizoHn~Lcxa^Y1c?z3pw1o9
zx>wSX(Un-`E^WOaeYH^TK|tp9pjcj+XGc6FmQP~xhPwHw^SfC;0V!yQM;cdvLQKaD
f>29fS3U31f3XhUG`z24~F?U~TxvG~n4<0`V`BXo#
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
GIT binary patch
delta 1008
zcmZ9KS!|U>6vuyG@4eql=MKfTVvIma6JAJ=h5(w_S`*{~#$b6U6cB+@szvDny@gUO
z*A0|KEqvfsS&FDE1;opuEt@DV6;NCN#RYHyt^4xe1JpB(X($i#|DScvIWy-%|D*jA
zZI@d114H@8Fr0eB0urg@@}TCSDC2q9!6TYS4Mi-}EYdutd0ewtvqZ7fkVd^`nd2v-
zjN?hoQ%-5nEZ3}XX@O#;;aXN{s$9s^if0UcsE?9(mgh9jYZ{}(c_B&-t2HH#*J#!{
zUZ-ht7p_;lXc)i-2QMjJR=lFvXc)*Q!yq;ru4jv;+1<2NvrV(zRe4pjLsRa=2E}WN
zq+ut!47=HrdNr@}h7((i4Be{PtJs&!@Dkp2`xOTi2R%%zwxqNwKC`l-TJfghP;y7g
zC{Mkmcw2Eeh=d#bcP#JnUeFlM%C@{uo8<$Jc=XK69#L>>;l#1Aer56US^1Wuv;}9w
zb%T%bq2(j$JR*5HWrM|Y+$kzAXL{v~`T3pF|0y3c(jzlyvYE#637=X%<3!LL$?{KH
zPVsqgJaTiE<qJ+*zT_***L>rlYpP4<R1}w&TFyxL5I;9`jI+UPKhu})&hc%q#4qge
z9p77G{NUhx(C!bt=7LN1tK-G-nre@fg4-=W@>4KOjp*HO`I$P!FP2~VP4T<s5B{|L
z#ox)5>R*3Su40^GyrM|SZ+imKkpiRTbdZixbdTtY3U!b|sLL(;I6;mt#)(WK%$>>e
zX}i3{WbPuujq+|&m@4k!9A+BDDCzzX)5WG4%>hc7L8>hBVoJqkgcoo(_YftJ)hJ^o
zmW|@Mm;2};nK5RGmPWg*NV!NoxhPq8P{385mBuTml)41H)3Xy*;t!D__Swvl)(WN3
zTaW?DFkJ&EWK;Sm;+;Z`pa&f^5xFA7J<?4X-KL$}Il0F?;V`v~k#eI%zD+np(3&3W
ad->yB9_}%px}a~y4ZXTs@0aux9{3N0S=J^1
delta 1059
zcmZ9KX>gQ95Qd-GYbM`Lf(ZqtGzt`0mQ`rVlF}a_Rv`;mqOq)?f*M@H%7V!*WH(&u
zu0c^yl;cB#H>e<rps=EV5fQ}$K@e2D?*kRQ05vFtp8QA=e@u5zPrq-!Ju}<;?Cq1^
zdUV4^pdUv)2GQg(gIkN}&uxa8QEulBXJ#2@d)&!ghB=124fh!48s=%{dz8>*Sm3-L
zWg+((?sJ=F!y?1|4)%cNL634CGBmi7hc%CQRL~S9|0s(MOAL=id7LMrEM=J?;rx?^
z<<384c-j%J&^+UD1}mLerFmBKoMyF0U)Fe>MZx1to;R#@OfMK-G^}%7)*Ch$(k^V)
zyrgOIc$tkJudu1;R9<DX3t#hO=+_NfG;b(Ewdqt!(aqmvPAr_GYE;h_&6}FHG;hl=
z3NJRbHZd_fKAp;FwrbuftOyKM#oJ^u&34VZ(#dZP&Wr4@?BqRvZm7rU0=Mj9x8;34
zP;?p4YjD+t)gv#9^-N~#>jnz7<wJJ+J3`aT_wbQ4w0ulX5gt&PJbR$!6LNk{xO?wU
z8KUSqAwD@?Sr<=@tE^5oq^HEk)FmvR@ww#-zVw^JJtALOzUCXhC4ByABFgeD--$BI
z_xxb_k-ZAjm`OCG;`M_3NkHY1{uO)pSz+7BQ;BTlh|7mtVovlg?DNx+>f-(U>N3AM
z^Si$@(y#j;jw+JL#<PtXMWE_p%by(ZPtt==K4>{aPV<-LZ~oD=S`PEC<v)%Trs>wm
zs1cegG*@b_(u_oji4GAnOjaAEXievej;dfA0fHUJ@`p#sib(Qmt|7#=g>5BkRlbJN
zggH+h;X2}SJcuofp%yLbH#1gphGFvl39hGz9J3iGIZu3!B;$$VlVt)oU|B9)b<|TV
z$QUW9E0J5NAT3cBjtJ^fsyIPe5k8Sg(w7CLz48rm9HdOr8KDYMEjlki^e6E;^lKV5
zlQmP?gQ;Q_w6TQn|4Q5)O)Kj(?DY1*6*r0xaTAwFyP*<aBtD40xHNXk@pp54x#DK|
QRDrT{yLHay1s>p*W3;^R5dZ)H
diff --git a/IdentService/nbproject/ant-deploy.xml b/IdentService/nbproject/ant-deploy.xml
index 2d5f877..5d33e0d 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 0f61037..0a28249 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 2a6a47a..b6af086 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
GIT binary patch
delta 232
zcmWm8Jx&5a7{>Ac0OQO~Oh`09qlu**(P(2tT$WLgMQ|4vKZ>n9!L}rO1(UJ$5QdI|
z19$-&&tlwZeoyk|$&>f9^U*24|2A9Tj8{X8D5w}3+E~wx;#L!CP7RWgV(hPXo{4Y9
zo~fp<xYrB}O=gO@;=!;_qDU1B!O=8KCU!B8!^oyK$;Oe*m+3Ih<JnjFQ(xze10f#W
zN?z!U<t`adZYvMPv-_2!#*3imN_p<yg<iky1hU&y)w)pZ1=P5#zOT`vTV)Hu6?IMu
M`dk-;92X4!0W&oxxc~qF
delta 267
zcmWm9y-tH*6oBFPYoQ+y5(iUJQ>&XM#t@C&{G))1rM5y#t$$4i7Y7%NYcB#<FT!+l
z@B+L6Z^YTiw>&2~Iqz`ZoOfsT{rC9=?DJqz=hQ4YvsmI>5lJo#0)ssZosJ|{+pgkL
zUG@}xgSO<#AhcK@k))D=#UevVCK(Afx?a)=2mRRd!!%5?$PXu@G>9j0?_>5;HOsn8
z%5a`(4WV5NTE%*;wQV!zMsaJi!m5qKvcP_tzE0ie#}{{)#5QZ(37W-@)+~PYO>sYO
k)FRzIkQ^c;M<x}H%Lgl*;FhzFz@y4;P8&ZbU@Is52Rwx<XaE2J
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
GIT binary patch
delta 1485
zcmXw(YiyHc6vyAwcfGOR_HJ$0?$Va6rCZmoy8z*`ceJ~(GR8JGSO_D{*cv1Zkg=H<
zqp(Cjh>~UftEllZ2r-6m8PpIUh73at7(^wQh(^N@6EDGt#t$YEJnzH&@a8$^_nhbd
zoacX%_s|hKbcAN_QK2o}Gq!hRVt72=yCKolMpDUooNn|OSCQmNugzdkSBx`qg{~xx
zho&NYCkOC@&Wjs5MHfh8#^S}O&WRDZ2ruRNP$L)P9(k}Q&yCmQk}_L5wSWE2U73;p
z)fMf!;mm%GBA6FML0%aqbxxB#-7_&Z{L~PB*ZI-U-y1qNT4g_0a|5SzJ{-?`7N<;G
z(VgE5yQvR1j4gP}vI8@Q71*Os;E{R2=o=o(42@@SR`%ffqBfN2d$ZOq^e@_k^X9cw
z0<sn&8a3e+V-@_-VwlX`xMN7+jJ^f7`~+t5Q%G6{jGhId`FbbxmL}{qZo_s{ClZEq
z)@nqRu^j{EH2&0g<AilNtwX>Y#OL-UX8kimqZ1jDYA~sfEi(7*+_7h9d}1tvfa7^s
z>@VjV7wjf!6RvoxP#&=3pxcMlRYA<uDX0mYph1=kqqfqW>#Qgv8o<8N&8RE=4fEDe
zZYn5KF6)UAb#hr0mx{lkZMafBn0u~TPgq>^fVvix4N(1MxZ}HuR(FWs>*AYQdA&xx
zNR&6Ar|b`w+=R=)AZF|Jcx21R0o!4RUCd~N+wL3Z?)T?jh%6@R*Sg9*4p?a6y;DIW
zUa!2J%Z8kkyB}Ujv|0EtTc3}3*o^BQUp9On*-!`<onhP!g?Y7L+6mEm5H}rnb8}uV
z(H3zoZm{J{g<itJNC;`84R>9o_%aga*nyL-H*s4DWql2Z7KXDvH%7JPRep-*ecWKj
zZlx5D3%<^^x;qFzM+b2%zLM(k&`^P?pj{@Z0rSQP<~$~jBU;RB69UyuNY+NET2#Ip
zGt*KO_@hV%w7S(?7vfpCIDVp~Ikh`xp}45`N3FcmD5@R@Y#c|$>GvC&a649+t#eR}
z3uC+y5eIHMG}$MYv4b3I`xQI@D_=ZhS;}PD0?~Xl;fvZPJRPs671&p}0;3I@IaU~I
z*$fwM#g<V}D?itG(JX%;-NIzjC9hI!m~M9B*Cti|Q2Ji5CdDDx7FCr`Nb`cJiXzxG
zW^YSB3D&IW1Y6#$%I`?O2)0JaW7a3XCq2+|O5m*OhI5T7&qxmiNy6Xk#*0jjNq-B{
zf+;3{F*z>%BUD-yo<4WAJ)zP$98Gx1EAp>6{|Jtxmr6yxCaKbS9N@fM<Y$tqe3HyU
zqeCeYth_~)Pm@)!l;RTXFtb@I5Nw@NEZD!yJ|?GNol2!(yINKGGXJHtm#oLpHaEUy
zGDrL;V$uaiyBn!CRsMtm;@k$MTAaJU>;k*3Ioz%I1zXat%9p50upVVGCfobuPbn($
zUL_`K^lMf58r2E5QHcvS&g?TDxTe*o)C=|_vl~2SjrA*yf^F<j=_aN-ytIt-BFuF(
R)75OsOEp@Wt4(dy{Rfx_(3SuI
delta 1492
zcmXw(du&s66vumdyS}z|?WJqGuHCw=uWfAWI@mIBx9c8kb!=-lCLw@@Jw$>5+(x1%
zhLPw$7?kasKtc=|h7cu&Atf-4k6{QIVg&sMH5z#t(1a)w5;Y5W?$7bp@0`zhpWpA^
z{fBA)VLE+_P%9PUAr%)|GpVs%BYTD?GU?t#PX}r8GpRje!!K^du&xYFogde=7W^O;
zph4%to4OKnex`GDV(s=FqvP1CEt}Rkk<u2!CArbV-gmSP*tK3{q#~_9gBylI`_s(U
zOmbX}8^H_OQj4q>9v&SR2xp}rW+X4N+5oyF7yj0k;JEHpEE>{yqEDd8+(r(h^BmZ1
zS%p+y2AA|rxMfOWHm}D}G(0xCbz&6$>H=KMO~9*f!{wX-<m7e3m$MNt^<j}?{xEi;
z#jqYnjDv=fr5NrI=M5d$X-?pkoHS<5N%ZAzAUC$?-LU5>$mq9m6$928*Py|)87D1`
znDh>!#%iP$pwbGo7%gVg!1irBw@&OC8^z6K5v(@aaL((+HFr?R_pAqO`C{S`b{Uvp
z&vE=>=|i_ah#OWTc3EFH8kX)Ndo*YyO5;Mf9;d4Q%Fc&-2~PKY>cu`s5I%DrJ`3EY
z6pk&A;c|r!&sSW7!xQ2K@NIb7`COoG_N~TG1>a{U9W_LKtVZAun~@27@hEhK)-Mqg
zW@J+~B^wB@RfTY{-im`of6@kF&iCdbWifHq5_ls)wmPvsQX$Shk59~}GNnk5p(=M)
zDzp;~iqI$dHWBtx8Q*PKH*K4vb;1z0Tc=AN)21cGg_K+Zm;EtrT0)rd^9%5wr+&5u
zvD<Hejn5C3UB_F25H<&L5iPw#&tadp5|c42iUK|yFTb00l&vD#EQ0*yGTwFtvvyYw
z!CDc*Ro}l^ho_5huX+>3kS>q#m6`EHU5Hn2z*Jq7>QJXI$7IARk)~-$c4Dx$3PW{u
zXsWNr!)QP}u)8%;WNR95B^IMbyev23M7`MB|B;nVxDbueO16ZjZECs|oGt_&n&oGf
zWG5G|<yOdF$@3Ypg<Ij-*rS2lYv6OGXo5#!x%sKgV;RxN<*xcHco1!-plUg@;$xF^
zMDrc?wK{1v{Bak4Z&svtH9rf|jCYu9P!#E?=B7#{Mb={~UVsH=Gn!uoi_1pA8sm!e
zp5`~fT4Xb`0qMBrzR(kLp71GXQKS=^2ZFWAR>9t2_P*wkU~RHZu!qb}YW`6fwc{hj
zg`tE(AL3ZT!(X%7!MCiRg00m<PNBE7Ds&oqS$7M4wpEeNkV$0il0AYIw<*$DvIv%x
zy@DNJc8=_VJu4Rrw#aOb3Pkm8*w(nPqg|0cp+e!cRxT4>KQjB2e1i4J0l|_Tiu5^^
z3f3!!1e;?v&-+&Q*C$5=3$Ib6FR4Oh>c`mO!XYLXsaklY<>kUFr&EzG@dHyM`{f$J
zCYUYoBT?Ca92M*~v#+R0uyt}wu>LNEzQ$CShyOHFaR=tR;`GgQ(nAfZnypQ4)cyzd
C9n>`d
diff --git a/KAA-JSP/build/web/catalog.jsp b/KAA-JSP/build/web/catalog.jsp
index 0bba014..6ac153a 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 5350b7a..c745543 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 2d5f877..5d33e0d 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 0f61037..0a28249 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 0a43f8b..dcecdda 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 0bba014..6ac153a 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 5350b7a..c745543 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 2d5f877..5d33e0d 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 0f61037..0a28249 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 76875b1..2854b66 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
--
GitLab