From cb3660786988a2fbb141c9b971b688e260943007 Mon Sep 17 00:00:00 2001
From: Isaac IY Saito <130s@lateeye.net>
Date: Sat, 27 Dec 2014 02:57:56 -0800
Subject: [PATCH] Replace rosbridge_server (addresses #12).

---
 package.xml                      | 2 +-
 script/webserver.py              | 4 ++--
 src/roswww/webrequest_handler.py | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.xml b/package.xml
index c82ca22..03dbff2 100644
--- a/package.xml
+++ b/package.xml
@@ -13,7 +13,7 @@
   <url type="repository">https://github.com/tork-a/roswww_pkg</url>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <run_depend>rosbridge_server</run_depend>
+  <run_depend>rosbridge_tools</run_depend>
   <run_depend>rospy</run_depend>
 
   <export/>
diff --git a/script/webserver.py b/script/webserver.py
index a8339d7..fae26a9 100755
--- a/script/webserver.py
+++ b/script/webserver.py
@@ -36,9 +36,9 @@
 
 import socket
 import subprocess
-import tornado.ioloop  # rosbridge installs tornado
-import tornado.web
 
+from rosbridge_tools import find_tornado
+tornado = find_tornado()
 import rospy
 
 from roswww.webrequest_handler import WebRequestHandler
diff --git a/src/roswww/webrequest_handler.py b/src/roswww/webrequest_handler.py
index 6e25263..a92bd4a 100755
--- a/src/roswww/webrequest_handler.py
+++ b/src/roswww/webrequest_handler.py
@@ -34,7 +34,8 @@
 #
 # Author: Jonathan Mace, Jihoon Lee, Isaac Isao Saito
 
-import tornado.web
+from rosbridge_tools import find_tornado
+tornado = find_tornado()
 
 
 class WebRequestHandler(tornado.web.RequestHandler):