1 files changed, 32 insertions, 25 deletions
diff --git a/same/src/main/java/com/orbekk/same/MasterApp.java b/same/src/main/java/com/orbekk/same/MasterApp.java
index 428336c..286b827 100644
--- a/same/src/main/java/com/orbekk/same/MasterApp.java
+++ b/same/src/main/java/com/orbekk/same/MasterApp.java
@@ -12,34 +12,41 @@ public class MasterApp {
     private static final int timeout = 1000;    
     
     public void run(int port) {
-        ConnectionManagerImpl connections = new ConnectionManagerImpl(timeout,
-                timeout);
-        State state = new State("MasterNetwork");
-        Broadcaster broadcaster =
-                BroadcasterImpl.getDefaultBroadcastRunner();
-        MasterServiceImpl master = new MasterServiceImpl(state, connections,
-                broadcaster);
-        JsonRpcServer jsonServer = new JsonRpcServer(master, MasterService.class);
-        server = new Server(port);
-        RpcHandler rpcHandler = new RpcHandler(master);
-        rpcHandler.addRpcServer("/MasterService.json", jsonServer);
-        server.setHandler(rpcHandler);
-        
-        Thread masterThread = new Thread(master);
-        masterThread.start();
-        
+//        ConnectionManagerImpl connections = new ConnectionManagerImpl(timeout,
+//                timeout);
+//        State state = new State("MasterNetwork");
+//        Broadcaster broadcaster =
+//                BroadcasterImpl.getDefaultBroadcastRunner();
+//        MasterServiceImpl master = new MasterServiceImpl(state, connections,
+//                broadcaster);
+//        JsonRpcServer jsonServer = new JsonRpcServer(master, MasterService.class);
+//        server = new Server(port);
+//        RpcHandler rpcHandler = new RpcHandler(master);
+//        rpcHandler.addRpcServer("/MasterService.json", jsonServer);
+//        server.setHandler(rpcHandler);
+//        
+//        Thread masterThread = new Thread(master);
+//        masterThread.start();
+//        
+//        try {
+//            server.start();
+//        } catch (Exception e) {
+//            logger.error("Could not start jetty server: {}", e);
+//        }
+//        
+//        try {
+//            server.join();
+//            masterThread.join();
+//        } catch (InterruptedException e) {
+//            logger.info("Received exception. Exiting. {}", e);
+//        }
+        SameController controller = SameController.create(port);
         try {
-            server.start();
+            controller.start();
         } catch (Exception e) {
-            logger.error("Could not start jetty server: {}", e);
-        }
-        
-        try {
-            server.join();
-            masterThread.join();
-        } catch (InterruptedException e) {
-            logger.info("Received exception. Exiting. {}", e);
+            logger.error("Failed to start Same", e);
         }
+        controller.join();
     }
     
     public static void main(String[] args) {