From a2a83f422a8d7431545efe0f1f83298c53519486 Mon Sep 17 00:00:00 2001
From: logsol <fartman@gmx.de>
Date: Sun, 22 Jul 2012 01:08:22 +0200
Subject: [PATCH 1/3] setting up bootstrapping

---
 app.js                  | 2 +-
 app/Bootstrap/Server.js | 6 +++---
 app/Bootstrap/client.js | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index c49b7d4..ca6ac73 100755
--- a/app.js
+++ b/app.js
@@ -4,7 +4,7 @@ var inspector = {};
 
 requirejs.config({
 	nodeRequire: require,
-	baseUrl: 'lib'
+	baseUrl: 'app'
 });
 
 var port = process.argv[2] 
diff --git a/app/Bootstrap/Server.js b/app/Bootstrap/Server.js
index 91ee84f..38fe102 100755
--- a/app/Bootstrap/Server.js
+++ b/app/Bootstrap/Server.js
@@ -1,7 +1,7 @@
 define([
-	"Server/HttpServer", 
-	"Server/Socket",
-	"Server/Coordinator"
+	"Bootstrap/HttpServer", 
+	"Bootstrap/Socket",
+	"Lobby/Coordinator"
 ],
 
 function(HttpServer, Socket, Coordinator) {
diff --git a/app/Bootstrap/client.js b/app/Bootstrap/client.js
index e704a47..c6edef2 100755
--- a/app/Bootstrap/client.js
+++ b/app/Bootstrap/client.js
@@ -1,5 +1,5 @@
 requirejs.config({
-	baseUrl: 'lib'
+	baseUrl: 'app'
 });
 
 var inspector = {};

From 36c0e34dc5b6460c63d634da17ddc443cd644dfa Mon Sep 17 00:00:00 2001
From: logsol <fartman@gmx.de>
Date: Sun, 22 Jul 2012 01:34:18 +0200
Subject: [PATCH 2/3] adapted bootstrapping

---
 app/Bootstrap/Client.js     | 11 +++++++++++
 app/Bootstrap/HttpServer.js |  2 +-
 app/Bootstrap/client.js     | 12 ------------
 client.js                   | 15 +++++++++++++++
 package.json                |  3 +--
 5 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100755 app/Bootstrap/Client.js
 delete mode 100755 app/Bootstrap/client.js
 create mode 100755 client.js
 mode change 100644 => 100755 package.json

diff --git a/app/Bootstrap/Client.js b/app/Bootstrap/Client.js
new file mode 100755
index 0000000..86a1bfe
--- /dev/null
+++ b/app/Bootstrap/Client.js
@@ -0,0 +1,11 @@
+requirejs.config({
+	baseUrl: 'app'
+});
+
+var inspector = {};
+
+requirejs(["Bootstrap/Client"], function(Client) {
+	
+	var client = new Client(location.href);
+	inspector.client = client;
+});
\ No newline at end of file
diff --git a/app/Bootstrap/HttpServer.js b/app/Bootstrap/HttpServer.js
index f6bb85d..cc2b473 100755
--- a/app/Bootstrap/HttpServer.js
+++ b/app/Bootstrap/HttpServer.js
@@ -36,7 +36,7 @@ function(http, nodeStatic) {
 							fileServer.serveFile('./node_modules/requirejs/require.js', 200, {}, req, res);
 							break;
 
-						case new RegExp(/^\/lib/).test(req.url):
+						case new RegExp(/^\/app/).test(req.url):
 							fileServer.serve(req, res, function(){
 								self.handleFileError(res)
 							});
diff --git a/app/Bootstrap/client.js b/app/Bootstrap/client.js
deleted file mode 100755
index c6edef2..0000000
--- a/app/Bootstrap/client.js
+++ /dev/null
@@ -1,12 +0,0 @@
-requirejs.config({
-	baseUrl: 'app'
-});
-
-var inspector = {};
-
-requirejs(["Client/Networker", "Vendor/SocketIO"], function(Networker, SocketIO) {
-	var socket = SocketIO.connect(location.href);
-	var networker = new Networker(socket);
-
-	inspector.networker = networker;
-});
\ No newline at end of file
diff --git a/client.js b/client.js
new file mode 100755
index 0000000..79a50c1
--- /dev/null
+++ b/client.js
@@ -0,0 +1,15 @@
+define([
+	"Game/Client/Networker", 
+	"Lib/Vendor/SocketIO"
+],
+
+function(Networker, SocketIO) {
+
+	function Client(location) {
+		this.socket = SocketIO.connect(location);
+		this.networker = new Networker(socket);
+	}
+
+	return Client;
+	
+});
\ No newline at end of file
diff --git a/package.json b/package.json
old mode 100644
new mode 100755
index 83b7280..15afafd
--- a/package.json
+++ b/package.json
@@ -25,6 +25,5 @@
     "node": "*"
   },
   "config": { "port": "1234" },
-  "private": true,
-  "scripts": {"start": "node app.js"}
+  "private": true
 }

From d4280023741d01ea1157dd7276985c1b3908daad Mon Sep 17 00:00:00 2001
From: logsol <fartman@gmx.de>
Date: Sun, 22 Jul 2012 01:35:23 +0200
Subject: [PATCH 3/3] changed app.js to server.js

---
 app.js => server.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app.js => server.js (100%)

diff --git a/app.js b/server.js
similarity index 100%
rename from app.js
rename to server.js