From ea144844b965ea0aaa0f79ea1615491e70a515f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Fri, 3 Feb 2012 17:11:33 +0100
Subject: Remove old code from ClientApp.

---
 same/src/main/java/com/orbekk/same/ClientApp.java | 39 -----------------------
 1 file changed, 39 deletions(-)

diff --git a/same/src/main/java/com/orbekk/same/ClientApp.java b/same/src/main/java/com/orbekk/same/ClientApp.java
index bc873fa..c9ab52e 100644
--- a/same/src/main/java/com/orbekk/same/ClientApp.java
+++ b/same/src/main/java/com/orbekk/same/ClientApp.java
@@ -13,45 +13,6 @@ public class ClientApp {
     private Server server;
     private static final int timeout = 1000;
     
-    @Deprecated
-    public SameInterface getClient(int port, String networkName,
-            String masterUrl) {
-        logger.info("Starting client with port:{}, networkName:{}, masterUrl:{}",
-                new Object[]{port, networkName, masterUrl});
-        ConnectionManagerImpl connections = new ConnectionManagerImpl(timeout,
-                timeout);
-        State state = new State(networkName);
-        Broadcaster broadcaster =
-                BroadcasterImpl.getDefaultBroadcastRunner();
-        MasterServiceImpl master = new MasterServiceImpl(state, connections,
-                broadcaster);
-        ClientServiceImpl client = new ClientServiceImpl(state, connections);
-        
-        JsonRpcServer jsonServer = new JsonRpcServer(client, ClientService.class);
-        server = new Server(port);
-        RpcHandler rpcHandler = new RpcHandler(client);
-        rpcHandler.addRpcServer("/ClientService.json", jsonServer);
-        server.setHandler(rpcHandler);
-        
-        try {
-            server.start();
-        } catch (Exception e) {
-            logger.error("Could not start jetty server: {}", e);
-        }
-        
-        while (client.getUrl() == null) {
-            HttpUtil.sendHttpRequest(masterUrl + "ping?port=" + port);
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException e) {
-                // Ignore interrupt in wait loop.
-            }
-        }
-        
-        client.joinNetwork(masterUrl + "MasterService.json");
-        return Same.createSame(client);
-    }
-    
     public void run(int port, String networkName,
             String masterUrl) {
         SameController controller = SameController.create(null);
-- 
cgit v1.2.3