yet another try

27AE60 · Jul 13, 2015 · da379a3 · da379a3
1 parent ef06356
commit da379a3
Show file tree

Hide file tree

Showing 48 changed files with 3 additions and 3 deletions.
diff --git a/entrapped-cmd/main.go → cmd/entrapped/main.go b/entrapped-cmd/main.go → cmd/entrapped/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/SKatiyar/entrapped"
+	"github.com/SKatiyar/entrapped/server"
 	"os"
 )
 

diff --git a/Godeps/Godeps.json → server/Godeps/Godeps.json b/Godeps/Godeps.json → server/Godeps/Godeps.json
diff --git a/Godeps/Readme → server/Godeps/Readme b/Godeps/Readme → server/Godeps/Readme
diff --git a/Godeps/_workspace/.gitignore → server/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore → server/Godeps/_workspace/.gitignore
diff --git a/...c/github.com/gorilla/websocket/.gitignore → ...c/github.com/gorilla/websocket/.gitignore b/...c/github.com/gorilla/websocket/.gitignore → ...c/github.com/gorilla/websocket/.gitignore
diff --git a/.../github.com/gorilla/websocket/.travis.yml → .../github.com/gorilla/websocket/.travis.yml b/.../github.com/gorilla/websocket/.travis.yml → .../github.com/gorilla/websocket/.travis.yml
diff --git a/.../src/github.com/gorilla/websocket/AUTHORS → .../src/github.com/gorilla/websocket/AUTHORS b/.../src/github.com/gorilla/websocket/AUTHORS → .../src/github.com/gorilla/websocket/AUTHORS
diff --git a/.../src/github.com/gorilla/websocket/LICENSE → .../src/github.com/gorilla/websocket/LICENSE b/.../src/github.com/gorilla/websocket/LICENSE → .../src/github.com/gorilla/websocket/LICENSE
diff --git a/...rc/github.com/gorilla/websocket/README.md → ...rc/github.com/gorilla/websocket/README.md b/...rc/github.com/gorilla/websocket/README.md → ...rc/github.com/gorilla/websocket/README.md
diff --git a/...ithub.com/gorilla/websocket/bench_test.go → ...ithub.com/gorilla/websocket/bench_test.go b/...ithub.com/gorilla/websocket/bench_test.go → ...ithub.com/gorilla/websocket/bench_test.go
diff --git a/...rc/github.com/gorilla/websocket/client.go → ...rc/github.com/gorilla/websocket/client.go b/...rc/github.com/gorilla/websocket/client.go → ...rc/github.com/gorilla/websocket/client.go
diff --git a/...m/gorilla/websocket/client_server_test.go → ...m/gorilla/websocket/client_server_test.go b/...m/gorilla/websocket/client_server_test.go → ...m/gorilla/websocket/client_server_test.go
diff --git a/...thub.com/gorilla/websocket/client_test.go → ...thub.com/gorilla/websocket/client_test.go b/...thub.com/gorilla/websocket/client_test.go → ...thub.com/gorilla/websocket/client_test.go
diff --git a/.../src/github.com/gorilla/websocket/conn.go → .../src/github.com/gorilla/websocket/conn.go b/.../src/github.com/gorilla/websocket/conn.go → .../src/github.com/gorilla/websocket/conn.go
diff --git a/...github.com/gorilla/websocket/conn_test.go → ...github.com/gorilla/websocket/conn_test.go b/...github.com/gorilla/websocket/conn_test.go → ...github.com/gorilla/websocket/conn_test.go
diff --git a/...e/src/github.com/gorilla/websocket/doc.go → ...e/src/github.com/gorilla/websocket/doc.go b/...e/src/github.com/gorilla/websocket/doc.go → ...e/src/github.com/gorilla/websocket/doc.go
diff --git a/...lla/websocket/examples/autobahn/README.md → ...lla/websocket/examples/autobahn/README.md b/...lla/websocket/examples/autobahn/README.md → ...lla/websocket/examples/autobahn/README.md
diff --git a/...cket/examples/autobahn/fuzzingclient.json → ...cket/examples/autobahn/fuzzingclient.json b/...cket/examples/autobahn/fuzzingclient.json → ...cket/examples/autobahn/fuzzingclient.json
diff --git a/...lla/websocket/examples/autobahn/server.go → ...lla/websocket/examples/autobahn/server.go b/...lla/websocket/examples/autobahn/server.go → ...lla/websocket/examples/autobahn/server.go
diff --git a/...gorilla/websocket/examples/chat/README.md → ...gorilla/websocket/examples/chat/README.md b/...gorilla/websocket/examples/chat/README.md → ...gorilla/websocket/examples/chat/README.md
diff --git a/...m/gorilla/websocket/examples/chat/conn.go → ...m/gorilla/websocket/examples/chat/conn.go b/...m/gorilla/websocket/examples/chat/conn.go → ...m/gorilla/websocket/examples/chat/conn.go
diff --git a/...gorilla/websocket/examples/chat/home.html → ...gorilla/websocket/examples/chat/home.html b/...gorilla/websocket/examples/chat/home.html → ...gorilla/websocket/examples/chat/home.html
diff --git a/...om/gorilla/websocket/examples/chat/hub.go → ...om/gorilla/websocket/examples/chat/hub.go b/...om/gorilla/websocket/examples/chat/hub.go → ...om/gorilla/websocket/examples/chat/hub.go
diff --git a/...m/gorilla/websocket/examples/chat/main.go → ...m/gorilla/websocket/examples/chat/main.go b/...m/gorilla/websocket/examples/chat/main.go → ...m/gorilla/websocket/examples/chat/main.go
diff --git a/...la/websocket/examples/filewatch/README.md → ...la/websocket/examples/filewatch/README.md b/...la/websocket/examples/filewatch/README.md → ...la/websocket/examples/filewatch/README.md
diff --git a/...illa/websocket/examples/filewatch/main.go → ...illa/websocket/examples/filewatch/main.go b/...illa/websocket/examples/filewatch/main.go → ...illa/websocket/examples/filewatch/main.go
diff --git a/.../src/github.com/gorilla/websocket/json.go → .../src/github.com/gorilla/websocket/json.go b/.../src/github.com/gorilla/websocket/json.go → .../src/github.com/gorilla/websocket/json.go
diff --git a/...github.com/gorilla/websocket/json_test.go → ...github.com/gorilla/websocket/json_test.go b/...github.com/gorilla/websocket/json_test.go → ...github.com/gorilla/websocket/json_test.go
diff --git a/...rc/github.com/gorilla/websocket/server.go → ...rc/github.com/gorilla/websocket/server.go b/...rc/github.com/gorilla/websocket/server.go → ...rc/github.com/gorilla/websocket/server.go
diff --git a/...thub.com/gorilla/websocket/server_test.go → ...thub.com/gorilla/websocket/server_test.go b/...thub.com/gorilla/websocket/server_test.go → ...thub.com/gorilla/websocket/server_test.go
diff --git a/.../src/github.com/gorilla/websocket/util.go → .../src/github.com/gorilla/websocket/util.go b/.../src/github.com/gorilla/websocket/util.go → .../src/github.com/gorilla/websocket/util.go
diff --git a/...github.com/gorilla/websocket/util_test.go → ...github.com/gorilla/websocket/util_test.go b/...github.com/gorilla/websocket/util_test.go → ...github.com/gorilla/websocket/util_test.go
diff --git a/....com/julienschmidt/httprouter/.travis.yml → ....com/julienschmidt/httprouter/.travis.yml b/....com/julienschmidt/httprouter/.travis.yml → ....com/julienschmidt/httprouter/.travis.yml
diff --git a/...thub.com/julienschmidt/httprouter/LICENSE → ...thub.com/julienschmidt/httprouter/LICENSE b/...thub.com/julienschmidt/httprouter/LICENSE → ...thub.com/julienschmidt/httprouter/LICENSE
diff --git a/...ub.com/julienschmidt/httprouter/README.md → ...ub.com/julienschmidt/httprouter/README.md b/...ub.com/julienschmidt/httprouter/README.md → ...ub.com/julienschmidt/httprouter/README.md
diff --git a/...thub.com/julienschmidt/httprouter/path.go → ...thub.com/julienschmidt/httprouter/path.go b/...thub.com/julienschmidt/httprouter/path.go → ...thub.com/julienschmidt/httprouter/path.go
diff --git a/...com/julienschmidt/httprouter/path_test.go → ...com/julienschmidt/httprouter/path_test.go b/...com/julienschmidt/httprouter/path_test.go → ...com/julienschmidt/httprouter/path_test.go
diff --git a/...ub.com/julienschmidt/httprouter/router.go → ...ub.com/julienschmidt/httprouter/router.go b/...ub.com/julienschmidt/httprouter/router.go → ...ub.com/julienschmidt/httprouter/router.go
diff --git a/...m/julienschmidt/httprouter/router_test.go → ...m/julienschmidt/httprouter/router_test.go b/...m/julienschmidt/httprouter/router_test.go → ...m/julienschmidt/httprouter/router_test.go
diff --git a/...thub.com/julienschmidt/httprouter/tree.go → ...thub.com/julienschmidt/httprouter/tree.go b/...thub.com/julienschmidt/httprouter/tree.go → ...thub.com/julienschmidt/httprouter/tree.go
diff --git a/...com/julienschmidt/httprouter/tree_test.go → ...com/julienschmidt/httprouter/tree_test.go b/...com/julienschmidt/httprouter/tree_test.go → ...com/julienschmidt/httprouter/tree_test.go
diff --git a/connectionhub.go → server/connectionhub.go b/connectionhub.go → server/connectionhub.go
diff --git a/entrapped.go → server/entrapped.go b/entrapped.go → server/entrapped.go
@@ -1,7 +1,7 @@
 package entrapped
 
 import (
-	"github.com/SKatiyar/entrapped/Godeps/_workspace/src/github.com/julienschmidt/httprouter"
+	"github.com/SKatiyar/entrapped/server/Godeps/_workspace/src/github.com/julienschmidt/httprouter"
 	"net/http"
 )
 

diff --git a/minefields.go → server/minefields.go b/minefields.go → server/minefields.go
diff --git a/minefields_test.go → server/minefields_test.go b/minefields_test.go → server/minefields_test.go
diff --git a/trap.go → server/trap.go b/trap.go → server/trap.go
diff --git a/troopers.go → server/troopers.go b/troopers.go → server/troopers.go
@@ -1,7 +1,7 @@
 package entrapped
 
 import (
-	"github.com/SKatiyar/entrapped/Godeps/_workspace/src/github.com/gorilla/websocket"
+	"github.com/SKatiyar/entrapped/server/Godeps/_workspace/src/github.com/gorilla/websocket"
 	"net/http"
 	"time"
 )

diff --git a/utility.go → server/utility.go b/utility.go → server/utility.go