diff options
Diffstat (limited to 'same/src/main/java/com/orbekk/same/SameController.java')
| -rw-r--r-- | same/src/main/java/com/orbekk/same/SameController.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java index ac99197..1261816 100644 --- a/same/src/main/java/com/orbekk/same/SameController.java +++ b/same/src/main/java/com/orbekk/same/SameController.java @@ -3,20 +3,20 @@ package com.orbekk.same; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.orbekk.net.BroadcasterInterface; import com.orbekk.net.BroadcastListener; import com.orbekk.net.BroadcasterFactory; +import com.orbekk.net.BroadcasterInterface; import com.orbekk.net.DefaultBroadcasterFactory; import com.orbekk.paxos.PaxosService; import com.orbekk.paxos.PaxosServiceImpl; import com.orbekk.same.config.Configuration; -import com.orbekk.same.http.JettyServerBuilder; -import com.orbekk.same.http.JettyServerContainer; +import com.orbekk.same.http.ServerContainer; import com.orbekk.same.http.StateServlet; +import com.orbekk.same.http.TjwsServerBuilder; public class SameController { private Logger logger = LoggerFactory.getLogger(getClass()); - private JettyServerContainer server; + private ServerContainer server; private Master master; private Client client; private PaxosServiceImpl paxos; @@ -60,7 +60,7 @@ public class SameController { StateServlet stateServlet = new StateServlet(client.getInterface(), new VariableFactory(client.getInterface())); - JettyServerContainer server = new JettyServerBuilder(port) + ServerContainer server = new TjwsServerBuilder(port) .withServlet(stateServlet, "/_/state") .withService(client.getService(), ClientService.class) .withService(master.getService(), MasterService.class) @@ -79,7 +79,7 @@ public class SameController { public SameController( Configuration configuration, - JettyServerContainer server, + ServerContainer server, Master master, Client client, PaxosServiceImpl paxos, |