提交: dd09028d2ca1c566b67de29c7ab6d6cf0ea074f8 - moto_web_app (git)

moto web application

Commit MetaInfo

• 修订版: dd09028d2ca1c566b67de29c7ab6d6cf0ea074f8 (tree)
• 时间: 2014-01-29 15:41:36
• 作者: astoria-d <astoria-d@mail...>
• Commiter: astoria-d

Log Message

push clean up, jms not to be used.

更改概述

• modified: WEB-INF/classes/motoSample/ChatBean.java
• delete: WEB-INF/classes/motoSample/PushBean.java
• modified: WEB-INF/classes/motoSample/UserBean.java
• modified: WEB-INF/faces-config.xml
• modified: WEB-INF/jboss-deployment-structure.xml
• modified: WEB-INF/web.xml
• modified: build.xml
• modified: secured/chat.xhtml

差异

--- a/WEB-INF/classes/motoSample/ChatBean.java
+++ b/WEB-INF/classes/motoSample/ChatBean.java
@@ -27,11 +27,7 @@ import javax.faces.component.html.HtmlCommandLink;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.util.UUID;
-/*
-import org.richfaces.application.push.TopicKey;
-import org.richfaces.application.push.TopicsContext;
-import org.richfaces.application.push.MessageException;
-*/
+
 import org.primefaces.push.PushContext;  
 import org.primefaces.push.PushContextFactory;  
 
@@ -49,9 +45,6 @@ public class ChatBean implements Serializable {
     @ManagedProperty("#{userBean}")
     private UserBean userBean;
     
-    @ManagedProperty("#{pushBean}")
-    private PushBean pushBean;
-    
     @ManagedProperty("#{loginMemberBean}")
     private LoginMemberBean loginMemberBean;
     
@@ -104,9 +97,6 @@ public class ChatBean implements Serializable {
     public void setUserBean(UserBean userBean) {
         this.userBean = userBean;
     }
-    public void setPushBean(PushBean pushBean) {
-        this.pushBean = pushBean;
-    }
     public void setLoginMemberBean(LoginMemberBean loginMemberBean) {
         this.loginMemberBean = loginMemberBean;
     }
@@ -136,13 +126,6 @@ public class ChatBean implements Serializable {
         }
     }
 
-    public class ViewMsgList {
-        public String viewId;
-        public String chatRoom;
-        public ArrayList<ChatMessage> msgList;
-        public MemberList memList;
-    }
-
 	private void initMsgList(){
         log.info("initMsgList: " + chatRoom + ", msgList: " 
             + (msgList == null ? "null" : msgList.hashCode()) + ", viewId: " + getViewId());
@@ -179,60 +162,9 @@ public class ChatBean implements Serializable {
         catch (SQLException se) {
             log.severe("sql err!!!");
         }
-
-	    //register viewlist in the session to receive ajax push notification update.
-	    HttpSession session = (HttpSession) context.getExternalContext().getSession(true);
-	    ArrayList<ViewMsgList> viewList = (ArrayList<ViewMsgList>) session.getAttribute("viewList");
-	    if (viewList == null) {
-	        viewList = new ArrayList<ViewMsgList>();
-	        session.setAttribute("viewList", viewList);
-	    }
-	    ViewMsgList vml = new ViewMsgList();
-	    vml.viewId = viewId;
-	    vml.chatRoom = chatRoom;
-	    vml.msgList = msgList;
-	    putViewList(viewList, vml);
 	}
-    
-    private static int MAX_VIEW_LIST_CNT = 3;
-    void putViewList(ArrayList<ViewMsgList> viewList, ViewMsgList vml) {
-        int i;
-        for (i = 0; i < viewList.size(); i++ ) {
-            ViewMsgList it_vml = viewList.get(i);
-            if (vml.viewId.equals(it_vml.viewId)) {
-                viewList.set(i, vml);
-                return;
-            }
-        }
-        viewList.add(vml);
-        if (viewList.size() > MAX_VIEW_LIST_CNT) {
-            //view number control.
-            ViewMsgList rm_vml = viewList.remove(0);
-            rm_vml.msgList.clear();
-
-            ChatMessage m = new ChatMessage();
-            m.uname = "----";
-            m.msg = "too much view is opened. please close this window (or tab).";
-            m.date = "----";
-            rm_vml.msgList.add(m);
 
-            /*
-            //notify browser.
-            try {
-               TopicKey topicKey = new TopicKey(rm_vml.viewId);
-               TopicsContext topicsContext = TopicsContext.lookup();
-               topicsContext.publish(topicKey, "notify");
-            }
-            catch (MessageException me) {
-                log.severe("message exeption!!");
-            }
-            */
-
-            log.info("old viewList is removed.");
-        }
-    }
-    
-	public ArrayList<ChatMessage> getMsgList(){
+    public ArrayList<ChatMessage> getMsgList(){
 //        log.info("getMsgList");
 //	    try {
     //System.out.print("viewId:" + viewId);
@@ -295,8 +227,6 @@ public class ChatBean implements Serializable {
         catch (SQLException se) {
             log.severe("sql err!!!");
         }
-        
-        //pushBean.pushChatMessage(viewId, chatRoom, msg, userBean.getUid(), dt);
     }
 
     public void loadOldMsg() {
@@ -347,17 +277,6 @@ public class ChatBean implements Serializable {
         memList.setChatRoom(chatRoom);
         memList.setLoginMember(loginMemberBean);
         memList.initMemList();
-
-	    //register viewlist in the session to receive ajax push notification update.
-	    HttpSession session = (HttpSession) context.getExternalContext().getSession(true);
-	    ArrayList<ViewMsgList> viewList = (ArrayList<ViewMsgList>) session.getAttribute("viewList");
-        for (ViewMsgList vml : viewList) {
-            if (vml.viewId.equals(viewId)) {
-        	    vml.memList = memList;
-                break;
-            }
-        }
-    
     }
     ///chat room menu value changed listener
     public void chatRoomChanged(ValueChangeEvent e) {

--- a/WEB-INF/classes/motoSample/PushBean.java
+++ /dev/null
@@ -1,300 +0,0 @@
-package motoSample;
-
-import java.io.Serializable;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
-import javax.faces.bean.ManagedProperty;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-
-import javax.servlet.http.HttpSession;
-
-import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
-/*
-import org.richfaces.application.push.TopicKey;
-import org.richfaces.application.push.TopicsContext;
-import org.richfaces.application.push.MessageException;
-*/
-import javax.jms.MessageListener;
-import javax.jms.Message;
-import javax.jms.MapMessage;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import java.util.Properties;
-
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicConnection;
-import javax.jms.Topic;
-import javax.jms.Session;
-import javax.jms.TopicSession;
-import javax.jms.TopicSubscriber;
-import javax.jms.TopicPublisher;
-import javax.jms.JMSException;
-
-import java.util.ArrayList;
-
import java.util.Vector;
-
import java.util.Iterator;
-
import javax.faces.model.SelectItem;
-
-
-@ManagedBean
-@SessionScoped
-public class PushBean implements MessageListener, Serializable {
-
-    @Inject
-    private Logger log;
-
-    @Inject
-    private FacesContext context = null;
-
-    private static final String PUSH_TYPE_MSG_POST = "messagePost";
-    private static final String PUSH_TYPE_LOG_IN = "login";
-    private static final String PUSH_TYPE_LOG_OFF = "logoff";
-    
-    private ArrayList<ChatBean.ViewMsgList> viewList;
-    
-    private static final String PUSH_JMS_TOPIC = "motoTest";
-
-    private TopicConnectionFactory getTopicConnectionFactory() {
-        try {
-            return (TopicConnectionFactory) InitialContext.doLookup("java:/ConnectionFactory");
-        } catch (NamingException e) {
-            try {
-                return (TopicConnectionFactory) InitialContext.doLookup("ConnectionFactory");
-            } catch (NamingException e2) {
-                throw new IllegalStateException("Can't find registered ConnectionFactory");
-            }
-        }
-    }
-
-    private TopicConnection connection = null;
-    private TopicSession session = null;
-    private TopicPublisher publisher = null;
-    private TopicSubscriber subscriber = null;
-
-    public void initPushBean() {
-
-        log.info("initPushBean");
-
-        try {
-            if (connection == null) {
-                TopicConnectionFactory tcf = getTopicConnectionFactory();
-                connection = tcf.createTopicConnection();
-                log.info("connection ok.");
-            }
-            if (session == null) {
-                session = connection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-                log.info("session ok.");
-            }
-
-            Topic topic = InitialContext.doLookup("topic/" + PUSH_JMS_TOPIC);
-            log.info("topic ok.");
-            
-            if (publisher == null) {
-                publisher = session.createPublisher(topic);
-                log.info("publisher ok.");
-            }
-            if (subscriber== null) {
-                subscriber = session.createSubscriber(topic);
-                log.info("subscriber ok.");
-
-                // Set a JMS message listener
-                subscriber.setMessageListener(this);
-                log.info("lisntener bind ok.");
-            }
-            
-            // Start the JMS connection; allows messages to be delivered
-            connection.start( );
-            log.info("connection start ok.");
-        }
-        catch (JMSException je) {
-            log.severe("jms exeption!!!");
-        }
-        catch (NamingException ne) {
-            log.severe("naming exeption!!!");
-        }
-
-        //get list of receiver view of this session....
-	    HttpSession req_session = (HttpSession) context.getExternalContext().getSession(true);
-	    viewList = (ArrayList<ChatBean.ViewMsgList>) req_session.getAttribute("viewList");
-	    if (viewList == null) {
-	        viewList = new ArrayList<ChatBean.ViewMsgList>();
-	        req_session.setAttribute("viewList", viewList);
-	    }
-    }
-
-    //this method is invoked from the sender side.
-    public void pushChatMessage(String viewId, String chatRoom, String msg, String uid, String date) {
-        log.info("push from view " + viewId + ", msg=" + msg);
-
-        try {
-            MapMessage message = session.createMapMessage();
-            message.setString("pushType", PUSH_TYPE_MSG_POST);
-            message.setString("viewId", viewId);
-            message.setString("chatRoom", chatRoom);
-            message.setString("msg", msg);
-            message.setString("uid", uid);
-            message.setString("date", date);
-            publisher.publish(message);
-
-            //deliver jms message
-            log.info("message published by " + this.hashCode());
-            //log.info("context: " + context);
-
-            /*
-            //notifying ajax is done by the message receiver
-            TopicKey topicKey = new TopicKey(chatRoom);
-            TopicsContext topicsContext = TopicsContext.lookup();
-            topicsContext.publish(topicKey, "notify");
-            */
-        }
-        catch (JMSException je) {
-            log.severe("jms exeption!!");
-        }
-    }
-
-    //this method is invoked from the sender side.
-    public void pushLogin(String uid, ArrayList<SelectItem> flights, boolean isLogin) {
-        log.info("login: " + uid);
-        try {
-            MapMessage message = session.createMapMessage();
-            message.setString("pushType", PUSH_TYPE_LOG_IN);
-            message.setString("uid", uid);
-            message.setBoolean("isLogin", isLogin);
-            publisher.publish(message);
-
-            //notify ajax page.
-            for (SelectItem si : flights) {
-                String chatRoom = si.getValue().toString();
-                /*
-                TopicKey topicKey = new TopicKey("login_" + chatRoom);
-                TopicsContext topicsContext = TopicsContext.lookup();
-                topicsContext.publish(topicKey, "notify");
-                */
-            }
-        }
-        catch (JMSException je) {
-            log.severe("jms exeption!!");
-        }
-        /*
-        catch (MessageException je) {
-            log.severe("message exeption!!");
-        }*/
-    }
-    
-    //this method is invoked on the receiver side.
-    public void onMessage(Message message) {
-        //msgCnt++;
-        log.info("message received by " + this.hashCode());
-        //log.info("viewMap size: " + viewMap.size());
-        MapMessage mmsg = (MapMessage)message;
-
-        try {
-            String msgType = mmsg.getString("pushType");
-            if (msgType.equals(PUSH_TYPE_MSG_POST)) {
-                onPostMsgDelivered(mmsg);
-            }
-            else if (msgType.equals(PUSH_TYPE_LOG_IN)) {
-                onLoginDelivered(mmsg);
-            }
-        }
-        catch (JMSException je) {
-            log.severe("get message error!!");
-        }
-    }
-
-    public void onPostMsgDelivered(MapMessage message) {
-        for (ChatBean.ViewMsgList vml : viewList) {
-            //update the view only if it has the same chat room
-            try {
-                if (!message.getString("chatRoom").equals(vml.chatRoom))
-                    continue;
-
-                ChatBean.ChatMessage m = new ChatBean.ChatMessage();
-                m.setUname(message.getString("uid"));
-                m.setMsg(message.getString("msg"));
-                m.setDate(message.getString("date"));
-                vml.msgList.add(m);
-
-                log.info("update msgview list!!: " + vml.viewId + "msg: " + message.getString("msg"));
-
-                /*
-                TopicKey topicKey = new TopicKey(vml.viewId);
-                TopicsContext topicsContext = TopicsContext.lookup();
-                topicsContext.publish(topicKey, "notify");
-                */
-            }
-            catch (JMSException je) {
-                log.severe("get message error!!");
-            }
-            /*
-            catch (MessageException me) {
-                log.severe("message exeption!!");
-            }*/
-        }
-    }
-    
-    public void onLoginDelivered(MapMessage message) {
-        try {
-            String uid = message.getString("uid");
-            boolean isLogin = message.getBoolean("isLogin");
-            
-
-            //check if the chat rooms are connected to the current view.
-            for (ChatBean.ViewMsgList vml : viewList) {
-                for (MemberList.ChatMember mc : vml.memList) {
-                    if (mc.getUname().equals(uid)) {
-                        mc.setIsLogin(isLogin);
-                        break;
-                    }
-                }
-            }
-        }
-        catch (JMSException je) {
-            log.severe("get message error!!");
-        }
-            
-    }
-    
-    @PreDestroy
-    public void preDestroy() {
-        log.info("preDestroy");
-        if (publisher != null) {
-            try {
-                publisher.close();
-            } catch (JMSException e) {
-                log.severe("unable to close publisher");
-            }
-        }
-        if (subscriber != null) {
-            try {
-                subscriber.close();
-            } catch (JMSException e) {
-                log.severe("unable to close subscriber");
-            }
-        }
-        if (session != null) {
-            try {
-                session.close();
-            } catch (JMSException e) {
-                log.severe("unable to close session");
-            }
-        }
-        if (connection != null) {
-            try {
-                connection.close();
-            } catch (JMSException e) {
-                log.severe("unable to close connection");
-            }
-        }
-    }
-}

--- a/WEB-INF/classes/motoSample/UserBean.java
+++ b/WEB-INF/classes/motoSample/UserBean.java
@@ -18,6 +18,9 @@ import javax.servlet.http.HttpSession;
 import java.util.ArrayList;
 import javax.faces.model.SelectItem;
 
+import org.primefaces.push.PushContext;  
+import org.primefaces.push.PushContextFactory;  
+
 @ManagedBean
 @SessionScoped
 public class UserBean implements Serializable {
@@ -27,14 +30,9 @@ public class UserBean implements Serializable {
 
    @Inject
     private FacesContext context;
 
-    @ManagedProperty("#{pushBean}")
-    private PushBean pushBean;
     @ManagedProperty("#{loginMemberBean}")
     private LoginMemberBean loginMemberBean;
 
-    public void setPushBean(PushBean pushBean) {
-        this.pushBean = pushBean;
-    }
     public void setLoginMemberBean(LoginMemberBean loginMemberBean) {
         this.loginMemberBean = loginMemberBean;
     }
@@ -91,7 +89,15 @@ public class UserBean implements Serializable {
             log.severe("sql flight err!!!");
         }
     }
-    
+
+    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 {
@@ -122,12 +128,18 @@ public class UserBean implements Serializable {
                     //add to the app login list.
                     loginMemberBean.login(uid, true);
                     //notify log in message
-                    pushBean.initPushBean();
-                    pushBean.pushLogin(uid, flights, true);
-                    
-                    HttpSession session = Resources.getSession();
+                    for (SelectItem si : flights) {
+                        String chatRoom = si.getValue().toString();
+                        LoginUser lu = new LoginUser();
+                        lu.setUid(uid);
+                	    lu.setLogin(true);
+
+                        PushContext pushContext = PushContextFactory.getDefault().getPushContext();  
+                        pushContext.push("/login_" + chatRoom, lu);  
+                    }
 
                     ///after login, redirect to the user specified url.
+                    HttpSession session = Resources.getSession();
                     String request_url = (String) session.getAttribute("request_url");
                     if (request_url == null)
                         request_url = "secured/chat.jsf";
@@ -152,7 +164,16 @@ public class UserBean implements Serializable {
     }
     
     public String doLogout() {
-        pushBean.pushLogin(uid, flights, false);
+        //notify log in message
+        for (SelectItem si : flights) {
+            String chatRoom = si.getValue().toString();
+            LoginUser lu = new LoginUser();
+            lu.setUid(uid);
+    	    lu.setLogin(false);
+
+            PushContext pushContext = PushContextFactory.getDefault().getPushContext();  
+            pushContext.push("/login_" + chatRoom, lu);  
+        }
         loginMemberBean.login(uid, false);
         context.getExternalContext().invalidateSession();
         return "/login.jsf";

--- a/WEB-INF/faces-config.xml
+++ b/WEB-INF/faces-config.xml
@@ -3,13 +3,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">  
   
     <application>  
-        <!-- push topic initializer registration -->
-        <!-- not needed ????
-            system-event-listener>  
-            <system-event-listener-class>motoSample.TopicsInitializer</system-event-listener-class>  
-            <system-event-class>javax.faces.event.PostConstructApplicationEvent</system-event-class>  
-        </system-event-listener -->  
     </application>  
   
-  
 </faces-config>  
\ No newline at end of file

--- a/WEB-INF/jboss-deployment-structure.xml
+++ b/WEB-INF/jboss-deployment-structure.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>  
 <jboss-deployment-structure>  
     <deployment>  
-         <dependencies>  
-              <module name="org.w3c.css.sac" />  
-              <module name="net.sourceforge.cssparser" />  
-        </dependencies>  
     </deployment>  
 </jboss-deployment-structure>

--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -43,28 +43,6 @@
     <auth-constraint>
     </auth-constraint>
   </security-constraint>
-  
-  <!-- enable richfaces push/jms -->
-    <context-param>
-        <param-name>org.richfaces.push.initializeOnStartup</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <param-name>org.richfaces.push.jms.enabled</param-name>
-        <param-value>false</param-value>
-    </context-param>
-    <context-param> 
-        <param-name>org.richfaces.push.jms.connectionUsername</param-name> 
-        <param-value>jmsuser</param-value>
-    </context-param>  
-    <context-param> 
-        <param-name>org.richfaces.push.jms.connectionPassword</param-name> 
-        <param-value>jmspassword</param-value> 
-    </context-param>  
-    <session-config>
-        <session-timeout>15</session-timeout>
-    </session-config>
-
 
     <!-- primefaces push servlet -->
     <servlet>

--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,6 @@
  <property name="inject" value="${env.JBOSS_HOME}\modules\javax\inject\api\main\javax.inject-1.jar"/>
  <property name="servlet" value="${env.JBOSS_HOME}\modules\javax\servlet\api\main\jboss-servlet-api_3.0_spec-1.0.0.Final.jar"/>
  <property name="cdi" value="${env.JBOSS_HOME}\modules\javax\enterprise\api\main\cdi-api-1.0-SP4.jar"/>
- <property name="jms" value="${env.JBOSS_HOME}\modules\javax\jms\api\main\jboss-jms-api_1.1_spec-1.0.0.Final.jar"/>
  <property name="primefaces" value="${lib}\primefaces-4.0.jar"/>
  <property name="atmosphere" value="${lib}\atmosphere-runtime-2.0.1.jar"/>
  <property name="slf4j" value="${lib}\slf4j-api-1.6.1.jar"/>
@@ -56,7 +55,6 @@
         <pathelement path="${inject}" />
         <pathelement path="${servlet}" />
         <pathelement path="${cdi}" />
-        <pathelement path="${jms}" />
         <pathelement path="${primefaces}" />
       </classpath>     
    </javac>

--- a/secured/chat.xhtml
+++ b/secured/chat.xhtml
@@ -25,7 +25,25 @@
 
                         var msg = document.getElementById("chatForm:msg");
                         msg.value = '';
-                    }
+                    }
+                    
+                    function handleLogin(data) {
+                        var memList = document.getElementById("chatForm:memList");
+                        var uid = data.uid;
+                        var login = data.login
+                        var i;
+                        for (i = 0; i < memList.rows.length; i++) {
+                            if (memList.rows[i].cells[0].innerHTML.trim() == uid) {
+                                if (login)
+                                    memList.rows[i].cells[1].innerHTML = "online";
+                                else
+                                    memList.rows[i].cells[1].innerHTML = "offline";
+                                break;
+                            }
+                        }
+
+                    }
+                    
                 //]]> 
             </script>
         </ui:define>
@@ -46,13 +64,7 @@
                 <h:inputHidden id="viewId" value="#{chatBean.viewId}"/>
 
 <p:socket onMessage="handleChatMsg" channel="/#{chatBean.chatRoom}" />
-
-                <!-- a4j:push address="login_#{chatBean.chatRoom}">
-                    <a4j:ajax event="dataavailable" render="memList" />
-                </a4j:push>
-                <a4j:push address="#{chatBean.viewId}">
-                    <a4j:ajax event="dataavailable" render="chatTable" />
-                </a4j:push -->
+<p:socket onMessage="handleLogin" channel="/login_#{chatBean.chatRoom}" />
 
                 chat room : 
                 <h:selectOneMenu id="chatRoom" value="#{chatBean.chatRoom}" onchange="submit()"