From b0569609d29217887d55803368abeb9a1f71a70c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 28 Feb 2012 17:24:27 +0100 Subject: Begin support for TJWS. Add TjwsServerContainer. Rename Jetty specific containers. --- same/src/main/java/com/orbekk/same/SameController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'same/src/main/java/com/orbekk/same/SameController.java') diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java index f1b94e7..ac99197 100644 --- a/same/src/main/java/com/orbekk/same/SameController.java +++ b/same/src/main/java/com/orbekk/same/SameController.java @@ -10,13 +10,13 @@ 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.ServerBuilder; -import com.orbekk.same.http.ServerContainer; +import com.orbekk.same.http.JettyServerBuilder; +import com.orbekk.same.http.JettyServerContainer; import com.orbekk.same.http.StateServlet; public class SameController { private Logger logger = LoggerFactory.getLogger(getClass()); - private ServerContainer server; + private JettyServerContainer 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())); - ServerContainer server = new ServerBuilder(port) + JettyServerContainer server = new JettyServerBuilder(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, - ServerContainer server, + JettyServerContainer server, Master master, Client client, PaxosServiceImpl paxos, -- cgit v1.2.3