From 7210e79e04b5cedbef455438f2e93819dcea2cd1 Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Mon, 7 Jun 2010 12:47:02 -0500
Subject: [PATCH] Move wsproxy and web utils into utils/ subdir.

---
 README.md                          | 8 ++++----
 tests/ws.py                        | 2 +-
 tests/wsencoding.py                | 2 +-
 Makefile => utils/Makefile         | 0
 web.py => utils/web.py             | 0
 websocket.c => utils/websocket.c   | 0
 websocket.h => utils/websocket.h   | 0
 websocket.py => utils/websocket.py | 0
 wsproxy.c => utils/wsproxy.c       | 0
 wsproxy.py => utils/wsproxy.py     | 0
 10 files changed, 6 insertions(+), 6 deletions(-)
 rename Makefile => utils/Makefile (100%)
 rename web.py => utils/web.py (100%)
 rename websocket.c => utils/websocket.c (100%)
 rename websocket.h => utils/websocket.h (100%)
 rename websocket.py => utils/websocket.py (100%)
 rename wsproxy.c => utils/wsproxy.c (100%)
 rename wsproxy.py => utils/wsproxy.py (100%)

diff --git a/README.md b/README.md
index 3a9b740..05e57c9 100644
--- a/README.md
+++ b/README.md
@@ -60,16 +60,16 @@ Usage
 
 * run the python proxy:
 
-    `./wsproxy.py [listen_port] [vnc_host] [vnc_port]`
+    `./utils/wsproxy.py [listen_port] [vnc_host] [vnc_port]`
 
-    `./wsproxy.py 8787 localhost 5901`
+    `./utils/wsproxy.py 8787 localhost 5901`
 
 
 * run the mini python web server to serve the directory:
 
-    `./web.py PORT`
+    `./utils/web.py PORT`
 
-    `./web.py 8080`
+    `./utils/web.py 8080`
 
 * Point your web browser at http://localhost:8080/vnc.html
  (or whatever port you used above to run the web server).
diff --git a/tests/ws.py b/tests/ws.py
index 1247253..40db606 100755
--- a/tests/ws.py
+++ b/tests/ws.py
@@ -11,7 +11,7 @@ import random, time
 from base64 import b64encode, b64decode
 from select import select
 
-sys.path.insert(0,os.path.dirname(__file__) + "/../")
+sys.path.insert(0,os.path.dirname(__file__) + "/../utils/")
 from websocket import *
 
 buffer_size = 65536
diff --git a/tests/wsencoding.py b/tests/wsencoding.py
index f29c2e9..e4d1477 100755
--- a/tests/wsencoding.py
+++ b/tests/wsencoding.py
@@ -12,7 +12,7 @@ from base64 import b64encode, b64decode
 from codecs import utf_8_encode, utf_8_decode
 from select import select
 
-sys.path.insert(0,os.path.dirname(__file__) + "/../")
+sys.path.insert(0,os.path.dirname(__file__) + "/../utils/")
 from websocket import *
 
 buffer_size = 65536
diff --git a/Makefile b/utils/Makefile
similarity index 100%
rename from Makefile
rename to utils/Makefile
diff --git a/web.py b/utils/web.py
similarity index 100%
rename from web.py
rename to utils/web.py
diff --git a/websocket.c b/utils/websocket.c
similarity index 100%
rename from websocket.c
rename to utils/websocket.c
diff --git a/websocket.h b/utils/websocket.h
similarity index 100%
rename from websocket.h
rename to utils/websocket.h
diff --git a/websocket.py b/utils/websocket.py
similarity index 100%
rename from websocket.py
rename to utils/websocket.py
diff --git a/wsproxy.c b/utils/wsproxy.c
similarity index 100%
rename from wsproxy.c
rename to utils/wsproxy.c
diff --git a/wsproxy.py b/utils/wsproxy.py
similarity index 100%
rename from wsproxy.py
rename to utils/wsproxy.py