Commit: e31aeeecdfda5a9d6275429f42fad879fc157fd3 - moto_web_app (git)

moto web application

Commit MetaInfo

• Revision: e31aeeecdfda5a9d6275429f42fad879fc157fd3 (tree)
• Time: 2014-01-30 11:40:10
• Author: astoria-d <astoria-d@mail...>
• Commiter: astoria-d

Log Message

push socket unified

Change Summary

• modified: WEB-INF/classes/motoSample/ChatBean.java
• add: WEB-INF/classes/motoSample/PushMsg.java
• modified: WEB-INF/classes/motoSample/UserBean.java
• modified: secured/chat.xhtml

Incremental Difference

--- a/WEB-INF/classes/motoSample/ChatBean.java
+++ b/WEB-INF/classes/motoSample/ChatBean.java
@@ -215,14 +215,14 @@ public class ChatBean implements Serializable {
 
             conn.close();
 
-            PushContext pushContext = PushContextFactory.getDefault().getPushContext();  
-            
-            ChatBean.ChatMessage cm = new ChatBean.ChatMessage();
+            PushMsg pm = PushMsg.newChatMessage();
+            PushMsg.ChatMessage cm = pm.getChatMessage();
             cm.setMsg(msg);
     	    cm.setDate(dt);
     	    cm.setUname(userBean.getUid());
 
-            pushContext.push("/" + chatRoom, cm);  
+            PushContext pushContext = PushContextFactory.getDefault().getPushContext();  
+            pushContext.push("/" + chatRoom, pm);  
         }
         catch (SQLException se) {
             log.severe("sql err!!!");

--- /dev/null
+++ b/WEB-INF/classes/motoSample/PushMsg.java
@@ -0,0 +1,56 @@
+package motoSample;
+
+
+public class PushMsg {
+
+    public static class LoginUser {
+        String uid;
+        boolean login;
+        
+        public void setUid(String uid) { this.uid = uid; }
+        public void setLogin(boolean login) { this.login = login; }
+        public String getUid() { return uid; }
+        public boolean getLogin() { return login; }
+    }
+    
+    public static class ChatMessage {
+        private String uname;
+        private String msg;
+        private String date;
+        
+        public String getUname() { return uname; }
+        public String getMsg() { return msg; }
+        public String getDate() { return date; }
+        public void setUname(String uname) { this.uname = uname; }
+        public void setMsg(String msg) { this.msg = msg; }
+        public void setDate(String date) { this.date = date; }
+    }
+    
+    private String pushType;
+    private LoginUser lu;
+    private ChatMessage cm;
+    
+    public String getPushType() { return pushType; }
+    public void setPushType(String pushType) { this.pushType = pushType; }
+    public LoginUser getLoginUser () { return lu; }
+    public void setLoginUser (LoginUser lu) { this.lu = lu; }
+    public ChatMessage getChatMessage () { return cm; }
+    public void setChatMessage (ChatMessage cm) { this.cm = cm; }
+    
+    public final static String PUSH_TYPE_LOGIN = "PUSH_TYPE_LOGIN";
+    public final static String PUSH_TYPE_CHAT_MESSAGE = "PUSH_TYPE_CHAT_MESSAGE";
+    
+    public static PushMsg newLoginPushMsg() {
+        PushMsg pm = new PushMsg();
+        pm.setPushType(PUSH_TYPE_LOGIN);
+        pm.setLoginUser(new LoginUser());
+        return pm;
+    }
+
+    public static PushMsg newChatMessage() {
+        PushMsg pm = new PushMsg();
+        pm.setPushType(PUSH_TYPE_CHAT_MESSAGE);
+        pm.setChatMessage(new ChatMessage());
+        return pm;
+    }
+}

--- a/WEB-INF/classes/motoSample/UserBean.java
+++ b/WEB-INF/classes/motoSample/UserBean.java
@@ -90,14 +90,6 @@ public class UserBean implements Serializable {
         }
     }
 
-    public static class LoginUser {
-        String uid;
-        boolean login;
-        public void setUid(String uid) { this.uid = uid; }
-        public void setLogin(boolean login) { this.login = login; }
-        public String getUid() { return uid; }
-        public boolean getLogin() { return login; }
-    }
     public String doLogin() {
 
         try {
@@ -130,12 +122,14 @@ public class UserBean implements Serializable {
                     //notify log in message
                     for (SelectItem si : flights) {
                         String chatRoom = si.getValue().toString();
-                        LoginUser lu = new LoginUser();
+                        
+                        PushMsg pm = PushMsg.newLoginPushMsg();
+                        PushMsg.LoginUser lu = pm.getLoginUser();
                         lu.setUid(uid);
                 	    lu.setLogin(true);
 
                         PushContext pushContext = PushContextFactory.getDefault().getPushContext();  
-                        pushContext.push("/login_" + chatRoom, lu);  
+                        pushContext.push("/" + chatRoom, pm);  
                     }
 
                     ///after login, redirect to the user specified url.
@@ -167,15 +161,17 @@ public class UserBean implements Serializable {
         //notify log in message
         for (SelectItem si : flights) {
             String chatRoom = si.getValue().toString();
-            LoginUser lu = new LoginUser();
+            PushMsg pm = PushMsg.newLoginPushMsg();
+            PushMsg.LoginUser lu = pm.getLoginUser();
             lu.setUid(uid);
     	    lu.setLogin(false);
 
             PushContext pushContext = PushContextFactory.getDefault().getPushContext();  
-            pushContext.push("/login_" + chatRoom, lu);  
+            pushContext.push("/" + chatRoom, pm);  
         }
         loginMemberBean.login(uid, false);
         context.getExternalContext().invalidateSession();
+        //login = false;
         return "/login.jsf";
     }
     

--- a/secured/chat.xhtml
+++ b/secured/chat.xhtml
@@ -4,12 +4,24 @@
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:ui="http://java.sun.com/jsf/facelets">
 
-	<ui:composition template="/WEB-INF/templates/moto-template.xhtml">
+	<ui:composition 
+	    template="/WEB-INF/templates/moto-template.xhtml"
+        xmlns:p="http://primefaces.org/ui"
+	>
     	<ui:define name="pageTitle">jsf chat app</ui:define>
 
         <ui:define name="ext-html-header">
             <script type="text/javascript">
                 //<![CDATA[
+                    function handleMessage(data) {
+                        if (data.pushType == 'PUSH_TYPE_CHAT_MESSAGE') {
+                            handleChatMsg(data.chatMessage);
+                        }
+                        else if (data.pushType == 'PUSH_TYPE_LOGIN') {
+                            handleLogin(data.loginUser);
+                        }
+                    }
+                    
                     function handleChatMsg(data) {
                         var msgList = document.getElementById("chatForm:msgList");
 
@@ -46,6 +58,9 @@
                     
                 //]]> 
             </script>
+
+<p:socket onMessage="handleMessage" channel="/#{chatBean.chatRoom}" />
+
         </ui:define>
         
     	<ui:define name="pageHeader" />
@@ -56,16 +71,10 @@
             <h:outputText value="#{chatBean.viewId}"/>
             <br />
 
-    		<h:form id="chatForm"
-    		    xmlns:a4j="http://richfaces.org/a4j"
-                xmlns:p="http://primefaces.org/ui"
-    		    xmlns:rich="http://richfaces.org/rich">
+    		<h:form id="chatForm">
 
                 <h:inputHidden id="viewId" value="#{chatBean.viewId}"/>
 
-<p:socket onMessage="handleChatMsg" channel="/#{chatBean.chatRoom}" />
-<p:socket onMessage="handleLogin" channel="/login_#{chatBean.chatRoom}" />
-
                 chat room : 
                 <h:selectOneMenu id="chatRoom" value="#{chatBean.chatRoom}" onchange="submit()" 
                     valueChangeListener="#{chatBean.chatRoomChanged}" >