From 2b8af11405149e4d3e3490d1f5d16068f95adaa0 Mon Sep 17 00:00:00 2001
From: Montana Scott Rowe <calcnerd256@gmail.com>
Date: Thu, 19 Jan 2012 17:46:55 -0600
Subject: [PATCH] moved server into a module and actual invocation out of it

---
 bin/run.sh     |  2 +-
 node/serve.js  | 24 ++++++++++++++++++++++++
 node/server.js |  4 ++--
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 node/serve.js

diff --git a/bin/run.sh b/bin/run.sh
index a5245ff77..878e0a55c 100755
--- a/bin/run.sh
+++ b/bin/run.sh
@@ -26,4 +26,4 @@ bin/installDeps.sh || exit 1
 #Move to the node folder and start
 echo "start..."
 cd "node"
-node server.js
+node serve.js
diff --git a/node/serve.js b/node/serve.js
new file mode 100644
index 000000000..12bbae66f
--- /dev/null
+++ b/node/serve.js
@@ -0,0 +1,24 @@
+/**
+ * This module is started with bin/run.sh. It sets up a Express HTTP and a Socket.IO Server. 
+ * Static file Requests are answered directly from the server module, Socket.IO messages are passed 
+ * to MessageHandler and minfied requests are passed to minified.
+ */
+
+/*
+ * derived from 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+require("./server").init(function(app, gets, posts, managers, handlers, db){});
\ No newline at end of file
diff --git a/node/server.js b/node/server.js
index db8e72995..4939075a7 100644
--- a/node/server.js
+++ b/node/server.js
@@ -1,5 +1,5 @@
 /**
- * This module is started with bin/run.sh. It sets up a Express HTTP and a Socket.IO Server. 
+ * This module is included by serve.js, which bin/run.sh invokes. It sets up a Express HTTP and a Socket.IO Server. 
  * Static file Requests are answered directly from this module, Socket.IO messages are passed 
  * to MessageHandler and minfied requests are passed to minified.
  */
@@ -605,5 +605,5 @@ function init(additionalSetup){
 
 }
 
-this.init = init;
+
 init(function(app, gets, posts, managers, handlers, db){});
\ No newline at end of file