Revision: 16364
Author: [email protected]
Date: Wed Jan 12 09:29:51 2011
Log: Fixes issue 2268
http://code.google.com/p/mobicents/source/detail?r=16364

Modified:
/branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/SimpleSipServlet.java /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/SimpleWebServlet.java /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/StatusServlet.java /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/sipapp/index.html

=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/SimpleSipServlet.java Tue Jan 11 09:01:48 2011 +++ /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/SimpleSipServlet.java Wed Jan 12 09:29:51 2011
@@ -148,6 +148,7 @@
                                }
                        }
                }
+//             notifyStatus("Got Success Response");
        }

        @Override
@@ -178,6 +179,7 @@
                SipServletResponse ok = request
                                .createResponse(SipServletResponse.SC_OK);
                ok.send();
+               notifyStatus("Received Bye request");
        }

        /**
@@ -214,11 +216,7 @@
HashMap<String, String> users = (HashMap<String, String>) getServletContext().getAttribute("registeredUsersMap");
                if(users == null) users = new HashMap<String, String>();

- BlockingQueue<HashMap<String,String>> usersQueue = (LinkedBlockingQueue<HashMap<String,String>>)getServletContext().getAttribute("usersQueue"); - if (usersQueue == null) usersQueue = new LinkedBlockingQueue<HashMap<String,String>>();
-
                getServletContext().setAttribute("registeredUsersMap", users);
-               getServletContext().setAttribute("usersQueue", usersQueue);

                Address address = req.getAddressHeader(CONTACT_HEADER);
                String fromURI = req.getFrom().getURI().toString();
@@ -233,18 +231,25 @@
                } else {
                        resp.setAddressHeader(CONTACT_HEADER, address);
                        users.put(fromURI, address.getURI().toString());
+
                        logger.info("User " + fromURI +
                                        " registered with an Expire time of " + 
expires);
                }
-
+
+               notifyStatus("Received register event");
+
+               resp.send();
+       }
+
+       protected void notifyStatus(String event){
+ BlockingQueue<String> eventsQueue = (LinkedBlockingQueue<String>)getServletContext().getAttribute("eventsQueue"); +// if (eventsQueue == null) eventsQueue = new LinkedBlockingQueue<String>();
+//             getServletContext().setAttribute("eventsQueue", eventsQueue);
+
                try {
-                       usersQueue.clear();
-                       usersQueue.put(users);
+                       eventsQueue.put(event);
                } catch (InterruptedException e) {
                        e.printStackTrace();
                }
-
-               resp.send();
-       }
-
-}
+       }
+}
=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/SimpleWebServlet.java Fri Jan 7 10:14:30 2011 +++ /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/SimpleWebServlet.java Wed Jan 12 09:29:51 2011
@@ -20,6 +20,8 @@
 import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.Properties;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;

 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -87,14 +89,16 @@
                        while(it.hasNext()) {
                                SipSession session = (SipSession) it.next();
                                Call call = (Call) session.getAttribute("call");
-                               call.end();
+                               if (call != null) call.end();
                                calls.removeCall(call);
+                               notifyStatus("Received Bye All request");
                        }
                } else {
// Someone wants to end an established call, send byes and clean up
                        Call call = calls.getCall(fromAddr, toAddr);
                        call.end();
                        calls.removeCall(call);
+                       notifyStatus("Received Bye request");
                }
         } else {
                if(calls == null) {
@@ -117,6 +121,7 @@
                logger.info("Sending request" + req);
                // Send the INVITE request
                req.send();
+               notifyStatus("Received Call request");
         }

         // Write the output html
@@ -125,7 +130,20 @@
         out = response.getWriter();

         // Just redirect to the index
- out.println("<HTML><META HTTP-EQUIV=\"Refresh\"CONTENT=\"0; URL=index.html\"><HEAD><TITLE></HTML>"); +// out.println("<HTML><META HTTP-EQUIV=\"Refresh\"CONTENT=\"0; URL=index.html\"><HEAD><TITLE></HTML>");
+        out.println("success");
         out.close();
     }
-}
+
+       protected void notifyStatus(String event){
+ BlockingQueue<String> eventsQueue = (LinkedBlockingQueue<String>)getServletContext().getAttribute("eventsQueue"); +// if (eventsQueue == null) eventsQueue = new LinkedBlockingQueue<String>();
+//             getServletContext().setAttribute("eventsQueue", eventsQueue);
+
+               try {
+                       eventsQueue.put(event);
+               } catch (InterruptedException e) {
+                       e.printStackTrace();
+               }
+       }
+}
=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/StatusServlet.java Tue Jan 11 09:01:48 2011 +++ /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/java/org/mobicents/servlet/sip/example/StatusServlet.java Wed Jan 12 09:29:51 2011
@@ -8,6 +8,7 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledThreadPoolExecutor;

 import javax.servlet.AsyncContext;
 import javax.servlet.AsyncEvent;
@@ -20,47 +21,60 @@
 import javax.servlet.http.HttpServletResponse;


+
+//@author gvagenas
+
+
 @WebServlet(urlPatterns={"/status"}, asyncSupported=true, loadOnStartup=1)
+//@WebServlet(urlPatterns={"/status"}, loadOnStartup=1)
 public class StatusServlet extends HttpServlet {
        private static final long serialVersionUID = 1L;

+ private static final String BEGIN_SCRIPT_TAG = "<script type='text/javascript'>\n";
+       private static final String END_SCRIPT_TAG = "</script>\n";
+
private static final Queue<AsyncContext> queue = new ConcurrentLinkedQueue<AsyncContext>();

-
-       HashMap<String, String> users = new HashMap<String,String>();
-       CallStatusContainer calls = new CallStatusContainer();
- BlockingQueue<HashMap<String,String>> usersQueue = new LinkedBlockingQueue<HashMap<String,String>>(); + private static final String JUNK = "<!-- Click-to-Call Sample Application with support for asynchronous processing -->\n";
+
+       HashMap<String, String> users = null;
+       CallStatusContainer calls = null;
+       BlockingQueue<String> eventsQueue = null;

        private Thread notifierThread = null;

        @Override
-       public void init(ServletConfig config) throws ServletException {
-               System.out.println("\nRunning the init now! "+new Date()+"\n");
-
-               config.getServletContext().setAttribute("usersQueue", 
usersQueue);
-
-
+       public void init(final ServletConfig config) throws ServletException {
+               eventsQueue = new LinkedBlockingQueue<String>();
+               if (eventsQueue == null) eventsQueue = new 
LinkedBlockingQueue<String>();
+
+               config.getServletContext().setAttribute("eventsQueue", 
eventsQueue);
+
                Runnable notifierRunnable = new Runnable() {
                        public void run() {
                                boolean done = false;
                                while (!done) {
-                                       HashMap<String, String> users = null;
+                                       String event = null;
                                        try {
-                                               users = usersQueue.take();
+                                               event = eventsQueue.take();
                                                for (AsyncContext ac : queue) {
                                                        try {
+ users = (HashMap<String, String>) config.getServletContext().getAttribute("registeredUsersMap");
+                                                               if(users == null) 
users = new HashMap<String, String>();
+ calls = (CallStatusContainer) config.getServletContext().getAttribute("activeCalls");
+                                                               if(calls == 
null) calls = new CallStatusContainer();
+
                                                                PrintWriter 
acWriter = ac.getResponse().getWriter();
                                                                
acWriter.println(printTable(users, calls));
                                                                
acWriter.flush();
-//                                                             
acWriter.close();
                                                        } catch(IOException ex) 
{
-                                                               
System.out.println("e...@init: "+ex);
+                                                               
System.out.println(ex);
                                                                
queue.remove(ac);
                                                        }
                                                }
                                        } catch(InterruptedException iex) {
                                                done = true;
-                                               System.out.println("i...@init: 
"+iex);
+                                               System.out.println(iex);
                                        }
                                }
                        }
@@ -71,6 +85,18 @@

protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

+               response.setContentType("text/html");
+               response.setHeader("Cache-Control", "private");
+               response.setHeader("Pragma", "no-cache");
+
+               PrintWriter writer = response.getWriter();
+               writer.write(JUNK);
+               // for Safari, Chrome, IE and Opera
+//             for (int i = 0; i < 10; i++) {
+//                     writer.write(JUNK);
+//             }
+               writer.flush();
+
                if(!request.isAsyncSupported()){
                        PrintWriter out = response.getWriter();
                        out.println("Asynchronous request processing is not 
supported");
@@ -95,13 +121,13 @@
                        }
                });
                queue.add(ac);
-
-       }
-
+               firstTimeReq(ac);
+       }
+
        @Override
        public void destroy() {
                queue.clear();
-        notifierThread.interrupt();
+               notifierThread.interrupt();
        }

protected String printTable(HashMap<String, String> users, CallStatusContainer calls) {
@@ -110,13 +136,11 @@


                if(users == null || users.isEmpty()) {
- tableData.append("<br><a>No registered users. Please register at least two SIP User Agents.</a><br/>");
-                       //                      return tableData.toString();
+ tableData.append("<br/><a>No registered users. Please register at least two SIP User Agents.</a><br/>");
                } else {
                        String[] userArray = new String[0];
                        userArray = users.keySet().toArray(userArray);

- // CallStatusContainer calls = (CallStatusContainer) req.getServletContext().getAttribute("activeCalls");
                        tableData.append("<table class=\"calltable\">");
                        tableData.append("<tr><td bgcolor=\"#DDDDDD\">From \\ 
To</td>");
for(String col:userArray) tableData.append("<td class=\"calltable\" bgcolor=\"#EEEEEE\" id=\"to\"><b>" + col + "</b></td>");
@@ -130,16 +154,13 @@
String status = calls==null? null:calls.getStatus(fromAddrV, toAddrV);
                                                if(status == null) status = 
"FFFFFF"; // This is hex RGB color
                                                if(status.equals("FFFFFF"))
-                                                       tableData.append("<td 
class=\"calltable\" bgcolor=\"#" + status
-                                                                       + "\" 
align=\"center\"><a href=\"call?to="
-                                                                       + users.get(toAddr) + 
"&from="
-                                                                       + users.get(fromAddr) 
+"\"\">call</a></td>");
+                                                       tableData.append("<td 
class=\"calltable\" bgcolor=\"#" + status
+                                                                       + "\" 
align=\"center\"><button type=\"button\" " +
+ "onclick=\"call('"+users.get(toAddr)+"','"+users.get(fromAddr)+"')\">call</button></td>");
                                                else
                                                        tableData.append("<td 
class=\"calltable\" bgcolor=\"#" + status
-                                                                       + "\" 
align=\"center\"><a>call in progress </a><a href=\"call?to="
-                                                                       + users.get(toAddr) + 
"&bye=true&from="
-                                                                       + users.get(fromAddr) 
+"\"\">end</a></td>");
-
+ + "\" align=\"center\"><a>call in progress </a><button type=\"button\" " + + "onclick=\"bye('"+users.get(toAddr)+"','"+users.get(fromAddr)+"')\">end</button></td>");
                                        } else {
                                                tableData.append("<td class=\"calltable\" 
></td>");
                                        }
@@ -147,83 +168,28 @@
                                tableData.append("</tr>");
                        }
                        tableData.append("</table>");
-                       tableData.append("<br/><a href=\"call?bye=all\">Close all 
calls</a>");
+ tableData.append("<br/><button type=\"button\" onclick=\"byeAll()\">Close all calls</button>");
                }

-               return tableData.toString();
-       }
-
-}
-
-
-class AsyncProviderStatus implements Runnable{
-
-       AsyncContext actx;
-       HashMap<String, String> users = new HashMap<String,String>();
-
-       public AsyncProviderStatus(AsyncContext actx) {
-               this.actx = actx;
+               result.append(BEGIN_SCRIPT_TAG);
+ result.append("parseJsonp({ msg: \"" + tableData.toString().replace("\"", "\\\"") + "\"});\n");
+               result.append(END_SCRIPT_TAG);
+
+               return result.toString();
        }

-       public void run() {
-
-               HttpServletRequest req = (HttpServletRequest) actx.getRequest();
-               HttpServletResponse resp = (HttpServletResponse) 
actx.getResponse();
-
- users = (HashMap<String, String>)req.getServletContext().getAttribute("registeredUsersMap");
-
-
-
-               PrintWriter out = null;
+       @SuppressWarnings("unchecked")
+       protected void firstTimeReq(AsyncContext ac){
+ calls = (CallStatusContainer) ac.getRequest().getServletContext().getAttribute("activeCalls"); + users = (HashMap<String, String>) ac.getRequest().getServletContext().getAttribute("registeredUsersMap");
+
                try {
-                       out = resp.getWriter();
-               } catch (IOException e) {
-                       e.printStackTrace();
-               }
-
-
-               if(users == null || users.isEmpty()) {
- out.println("<a>No registered users. Please register at least two SIP User Agents.</a><br/>");
-                       out.close();
-                       actx.complete();
-               } else {
-                       String[] userArray = new String[0];
-                       userArray = users.keySet().toArray(userArray);
-
- CallStatusContainer calls = (CallStatusContainer) req.getServletContext().getAttribute("activeCalls");
-                       out.println("<table class=\"calltable\">");
-                       out.println("<tr><td bgcolor=\"#DDDDDD\">From \\ 
To</td>");
- for(String col:userArray) out.println("<td class=\"calltable\" bgcolor=\"#EEEEEE\" id=\"to\"><b>" + col + "</b></td>");
-                       out.println("</tr>");
-                       for(String fromAddr:userArray) {
- out.println("<tr><td bgcolor=\"#EEEEEE\" id=\"from\"><b>"+fromAddr +"</b></td>");
-                               String fromAddrV = users.get(fromAddr);
-                               for(String toAddr:userArray) {
-                                       if(!toAddr.equals(fromAddr)) {
-                                               String toAddrV = 
users.get(toAddr);
- String status = calls==null? null:calls.getStatus(fromAddrV, toAddrV);
-                                               if(status == null) status = 
"FFFFFF"; // This is hex RGB color
-                                               if(status.equals("FFFFFF"))
-                                                       out.println("<td 
class=\"calltable\" bgcolor=\"#" + status
-                                                                       + "\" 
align=\"center\"><a href=\"call?to="
-                                                                       + users.get(toAddr) + 
"&from="
-                                                                       + users.get(fromAddr) 
+"\"\">call</a></td>");
-                                               else
-                                                       out.println("<td 
class=\"calltable\" bgcolor=\"#" + status
-                                                                       + "\" 
align=\"center\"><a>call in progress </a><a href=\"call?to="
-                                                                       + users.get(toAddr) + 
"&bye=true&from="
-                                                                       + users.get(fromAddr) 
+"\"\">end</a></td>");
-
-                                       } else {
-                                               out.println("<td class=\"calltable\" 
></td>");
-                                       }
-                               }
-                               out.println("</tr>");
-                       }
-                       out.println("</table>");
-                       out.println("<br/><a href=\"call?bye=all\">Close all 
calls</a>");
-                       out.close();
-                       actx.complete();
+                       PrintWriter acWriter = ac.getResponse().getWriter();
+                       acWriter.println(printTable(users, calls));
+                       acWriter.flush();
+               } catch(IOException ex) {
+                       System.out.println(ex);
+                       queue.remove(ac);
                }
        }
 }
=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/sipapp/index.html Tue Jan 11 09:01:48 2011 +++ /branches/servers/sip-servlets/2.0/sip-servlets-examples/click-to-call-servlet3.0/src/main/sipapp/index.html Wed Jan 12 09:29:51 2011
@@ -6,11 +6,15 @@
 <script type="text/javascript" src="js/jquery.js"></script>

 <script type="text/javascript">
+       $(document).ready(function() {
+               $("#msg").ajaxError(function(event, request, settings){
+                  $(this).append("<li>Error requesting page " + settings.url + 
"</li>");
+                });
+       });

        function update() {
//Make the AJAX call with jQuery to avoid compatibility issues with browsers
                var xhr = $.ajax({url: '/Click2CallAsync/status',
-                       dataType: "html";
                        async: true,
                        success: function(data){
                        $("#text").html(data);
@@ -19,21 +23,38 @@
//Check the state of the XmlHttpRequest object. Since the PrintWriter just flushes and doesn't close
                //the stream, the XmlHttpRequest readyState = 3.
                xhr.onreadystatechange = function() {
-                 if (xhr.readyState >= 3 && xhr.status == 200) {
+                 if (xhr.readyState == 3 && xhr.status == 200) {
                          $("#text").html(xhr.responseText);
                  }
                };
-       }
-
+       };
+
        $(document).ready(function() {
                update();
        });
+
+
+function parseJsonp(resp){
+       $("#text").html(resp.msg);
+};
+function call(firstToCall, secondToCall){
+       $.get("/Click2CallAsync/call", { to: firstToCall, from: secondToCall });
+};
+function bye(firstToBye, secondToBye){
+ $.get("/Click2CallAsync/call", {to: firstToBye, bye: "true", from: secondToBye});
+};
+function byeAll(){
+       $.get("/Click2CallAsync/call", {bye: "all"});
+};
 </script>

 <style>
-body { font-family: Tahoma, Geneva, 'Trebuchet MS', Arial, Helvetica, sans-serif; }
-
-.calltable, a {
+body {
+       font-family: Tahoma, Geneva, 'Trebuchet MS', Arial, Helvetica,
+               sans-serif;
+}
+
+.calltable,a {
        border: 1px solid #D4E0EE;
        border-collapse: collapse;
        font-family: "Trebuchet MS", Arial, sans-serif;
@@ -45,28 +66,34 @@
        width: 100%;
 }

-td.calltable, tr {
+td.calltable,tr {
        padding: 4px;
-border: 1px dotted black;
+       border: 1px dotted black;
 }
 </style>

 </head>
 <body>

-<table class="headtable"><tr>
-<td style="vertical-align:middle"><img alt="Mobicents" src="images/mobicents.logo.jpeg"/> -<a style="font-size: 30px;margin-left:100px"><b>Click-to-Call Sample Application</b></a></td>
-</tr></table>
-<hr/>
-
-<div id="callTable">
-<br><a>No registered users. Please register at least two SIP User Agents.</a><br/>
+<table class="headtable">
+       <tr>
+               <td style="vertical-align: middle"><img alt="Mobicents"
+                       src="images/mobicents.logo.jpeg" /> <a
+                       style="font-size: 30px; margin-left: 
100px"><b>Click-to-Call
+               Sample Application with support for asynchronous processing 
</b></a></td>
+       </tr>
+</table>
+<hr />
+
+<div id="text">
+<br/>
+<a>No registered users. Please register at least two SIP User Agents.</a>
+<br/>
 </div>

-<hr/>
-<em>Will refresh every 5 seconds.</em>
-<div class="log" id="errorMsg"></div>
+<hr />
+
+<div class="log" id="msg"></div>

 </body>
 </html>

Reply via email to