コミット: 1816d8604e55b94b08df43ab939ef7b4b32ebd96 - moto_web_app (git)

moto web application

コミットメタ情報

• リビジョン: 1816d8604e55b94b08df43ab939ef7b4b32ebd96 (tree)
• 日時: 2014-02-03 17:27:16
• 作者: astoria-d <astoria-d@mail...>
• コミッター: astoria-d

ログメッセージ

clean up

変更サマリ

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

差分

--- a/WEB-INF/classes/motoSample/AtmosRes.java
+++ b/WEB-INF/classes/motoSample/AtmosRes.java
@@ -43,18 +43,4 @@ public class AtmosRes {
         }
     }
 
-    /**
-     * Simple annotated class that demonstrate how {@link org.atmosphere.config.managed.Encoder} and {@link org.atmosphere.config.managed.Decoder
-     * can be used.
-     *
-     * @param message an instance of {@link Message}
-     * @return
-     * @throws IOException
-    @org.atmosphere.config.service.Message(encoders = {JacksonEncoder.class}, decoders = {JacksonDecoder.class})
-    public Message onMessage(Message message) throws IOException {
-        logger.info("{} just send {}", message.getAuthor(), message.getMessage());
-        return message;
-    }
-     */
-
 }
\ No newline at end of file

--- a/WEB-INF/classes/motoSample/ChatBean.java
+++ b/WEB-INF/classes/motoSample/ChatBean.java
@@ -28,9 +28,6 @@ import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.util.UUID;
 
-//import org.primefaces.push.PushContext;  
-//import org.primefaces.push.PushContextFactory;  
-
 import org.atmosphere.cpr.Broadcaster;
 import org.atmosphere.cpr.BroadcasterFactory;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -227,9 +224,6 @@ public class ChatBean implements Serializable {
     	    cm.setDate(dt);
     	    cm.setUname(userBean.getUid());
 
-            //PushContext pushContext = PushContextFactory.getDefault().getPushContext();  
-            //pushContext.push("/" + chatRoom, pm);  
-            
             Broadcaster b = BroadcasterFactory.getDefault().lookup("/chat", true);
             ObjectMapper mapper = new ObjectMapper();
             try {

--- a/WEB-INF/classes/motoSample/UserBean.java
+++ b/WEB-INF/classes/motoSample/UserBean.java
@@ -18,8 +18,10 @@ import javax.servlet.http.HttpSession;
 import java.util.ArrayList;
 import javax.faces.model.SelectItem;
 
-//import org.primefaces.push.PushContext;  
-//import org.primefaces.push.PushContextFactory;  
+import org.atmosphere.cpr.Broadcaster;
+import org.atmosphere.cpr.BroadcasterFactory;
+import org.codehaus.jackson.map.ObjectMapper;
+import java.io.IOException;
 
 @ManagedBean
 @SessionScoped
@@ -123,12 +125,19 @@ public class UserBean implements Serializable {
                     for (SelectItem si : flights) {
                         String chatRoom = si.getValue().toString();
                         
-                        /*PushMsg pm = PushMsg.newLoginPushMsg();
-                        pm.lu.uid = uid;
-                	    pm.lu.login = true;
-*/
-                        //PushContext pushContext = PushContextFactory.getDefault().getPushContext();  
-                        //pushContext.push("/" + chatRoom, pm);  
+                        PushMsg pm = PushMsg.newLoginPushMsg();
+                        PushMsg.LoginUser lu = pm.getLoginUser();
+                        lu.setUid(uid);
+                        lu.setLogin(true);
+
+                        Broadcaster b = BroadcasterFactory.getDefault().lookup("/chat", true);
+                        ObjectMapper mapper = new ObjectMapper();
+                        try {
+                            String json = mapper.writeValueAsString(pm);
+                            b.broadcast(json);
+                        } catch (IOException e) {
+                            log.severe("json encode error.");
+                        }
                     }
 
                     ///after login, redirect to the user specified url.
@@ -160,12 +169,19 @@ public class UserBean implements Serializable {
         //notify log in message
         for (SelectItem si : flights) {
             String chatRoom = si.getValue().toString();
-            /*PushMsg pm = PushMsg.newLoginPushMsg();
-            pm.lu.uid = uid;
-    	    pm.lu.login = false;
-*/
-            //PushContext pushContext = PushContextFactory.getDefault().getPushContext();  
-            //pushContext.push("/" + chatRoom, pm);  
+            PushMsg pm = PushMsg.newLoginPushMsg();
+            PushMsg.LoginUser lu = pm.getLoginUser();
+            lu.setUid(uid);
+            lu.setLogin(false);
+
+            Broadcaster b = BroadcasterFactory.getDefault().lookup("/chat", true);
+            ObjectMapper mapper = new ObjectMapper();
+            try {
+                String json = mapper.writeValueAsString(pm);
+                b.broadcast(json);
+            } catch (IOException e) {
+                log.severe("json encode error.");
+            }
         }
         loginMemberBean.login(uid, false);
         context.getExternalContext().invalidateSession();

--- a/secured/chat.xhtml
+++ b/secured/chat.xhtml
@@ -74,19 +74,12 @@ $(function () {
     var content = $('#content');
     //var input = $('#input');
     var input = $('#chatForm\\:msg');
-    var submitBtn = $('#chatForm\\:postBtn');
-    var inputStatus = $('#chatForm\\:inputStatus');
-
+
     var status = $('#status');
-    var myName = false;
-    var author = null;
-    var logged = false;
     var socket = atmosphere;
     var subSocket;
     var transport = 'websocket';
 
-    inputStatus.value = 'init';
-
     // We are now ready to cut the request
     var request = { url: '/moto_web_app/chat',
         contentType : "application/json",
@@ -110,7 +103,7 @@ $(function () {
 
     request.onClientTimeout = function(r) {
         content.html($('<p>', { text: 'Client closed the connection after a timeout. Reconnecting in ' + request.reconnectInterval }));
-        subSocket.push(atmosphere.util.stringifyJSON({ author: author, message: 'is inactive and closed the connection. Will reconnect in ' + request.reconnectInterval }));
+        //subSocket.push(atmosphere.util.stringifyJSON({ author: author, message: 'is inactive and closed the connection. Will reconnect in ' + request.reconnectInterval }));
         input.attr('disabled', 'disabled');
         setTimeout(function (){
             subSocket = socket.subscribe(request);
@@ -134,28 +127,19 @@ $(function () {
         var message = response.responseBody;
         try {
             var json = atmosphere.util.parseJSON(message);
-            handleMessage(json);
         } catch (e) {
             console.log('This doesn\'t look like a valid JSON: ', message);
             return;
         }
-        
 
+        handleMessage(json);
         input.removeAttr('disabled').focus();
-        /*if (!logged && myName) {
-            logged = true;
-            status.text(myName + ': ').css('color', 'blue');
-        } else {
-            var me = json.author == author;
-            var date = typeof(json.time) == 'string' ? parseInt(json.time) : json.time;
-            addMessage(json.author, json.message, me ? 'blue' : 'black', new Date(date));
-        }*/
     };
 
     request.onClose = function(response) {
         content.html($('<p>', { text: 'Server closed the connection after a timeout' }));
         if (subSocket) {
-            subSocket.push(atmosphere.util.stringifyJSON({ author: author, message: 'disconnecting' }));
+            //subSocket.push(atmosphere.util.stringifyJSON({ author: author, message: 'disconnecting' }));
         }
         input.attr('disabled', 'disabled');
     };
@@ -163,7 +147,6 @@ $(function () {
     request.onError = function(response) {
         content.html($('<p>', { text: 'Sorry, but there\'s some problem with your '
             + 'socket or the server is down' }));
-        logged = false;
     };
 
     request.onReconnect = function(request, response) {
@@ -172,82 +155,9 @@ $(function () {
     };
 
     subSocket = socket.subscribe(request);
-
/*
-    input.keydown(function(e) {
-        //console.log(e);
-        console.log("keydown. kc: " + e.keyCode + ", st: " + inputStatus.value);
-        if (e.keyCode === 13) {
-            var msg = $(this).val();
-
-            // First message is always the author's name
-            if (author == null) {
-                author = msg;
-            }
-
-            //subSocket.push(atmosphere.util.stringifyJSON({ author: author, message: msg }));
-//            $(this).val('');
-
-//            input.attr('disabled', 'disabled');
-            if (myName === false) {
-                myName = msg;
-            }
-            inputStatus.value = 'dataSubmit';
-            inputStatus.change();
-        }
-    });
-    
-    inputStatus.change(function () {
-        console.log('status changed: ' + inputStatus.value);
-        if (inputStatus.value == 'dataProcessed') {
-            alert('bbb');
-            inputStatus.value = 'pushRequested';
-            inputStatus.change();
-        }
-    });
-
-    function pushMsg(uid, msg) {
-        subSocket.push(atmosphere.util.stringifyJSON({ author: uid, message: msg }));
-    }
-*/
-    function addMessage(author, message, color, datetime) {
-        content.append('<p><span style="color:' + color + '">' + author + '</span> @ ' +
-            + (datetime.getHours() < 10 ? '0' + datetime.getHours() : datetime.getHours()) + ':'
-            + (datetime.getMinutes() < 10 ? '0' + datetime.getMinutes() : datetime.getMinutes())
-            + ': ' + message + '</p>');
-    }
-});
 
-/*    function handlePostBtn(data) {
-        var buttonElement = data.source; // The HTML DOM element which invoked the ajax event.
-        var ajaxStatus = data.status; // Can be "begin", "complete" and "success".
-        //var inputStatus = document.getElementById("chatForm:inputStatus");
-        var inputStatus = $('#chatForm\\:inputStatus');
+});
 
-        switch (ajaxStatus) {
-            case "begin": // This is called right before ajax request is been sent.
-                buttonElement.disabled = true;
-                break;
-
-            case "complete": // This is called right after ajax response is received.
-                // We don't want to enable it yet here, right?
-                break;
-
-            case "success": // This is called when ajax response is successfully processed.
-                buttonElement.disabled = false;
-                
-                var msg = document.getElementById("chatForm:msg");
-                msg.value = '';
-                msg.focus();
-                //pushMsg('aaa', 'bss');
-                inputStatus.value = "dataProcessed";
-                console.log("ajax return. st: " + inputStatus.value);
-
                inputStatus.change();
-
-                break;
-        }
-    }
-
*/
-
                 //]]> 
             </script>
 
@@ -312,7 +222,6 @@ $(function () {
                     <f:ajax execute="viewId chatRoom msg" />
                     <!-- f:ajax execute="viewId chatRoom msg" onevent="handlePostBtn" / -->
                 </h:commandButton>
-                <h:inputHidden id="inputStatus" value=""/>
 
                         </td>
                         <td>
@@ -343,7 +252,6 @@ $(function () {
     <div id="content"></div>
     <div>
         <span id="status">Connecting...</span>
-        <input type="text" id="input" disabled="disabled"/>
     </div>
 
     	</ui:define>