summaryrefslogtreecommitdiff
path: root/same/src/test/java/com/orbekk
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-28 17:24:27 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-28 17:24:27 +0100
commitb0569609d29217887d55803368abeb9a1f71a70c (patch)
treeecfbb6531a0e44703046d6ea20661c75cdb7f40f /same/src/test/java/com/orbekk
parentbf8e87bec12e6ec53ec2150d7a6f6d0e493c79ce (diff)
Begin support for TJWS.
Add TjwsServerContainer. Rename Jetty specific containers.
Diffstat (limited to 'same/src/test/java/com/orbekk')
-rw-r--r--same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java b/same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java
index 278f775..32c7dff 100644
--- a/same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java
+++ b/same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java
@@ -5,8 +5,8 @@ import static org.junit.Assert.*;
import com.googlecode.jsonrpc4j.JsonRpcServer;
import com.orbekk.same.ConnectionManagerImpl;
import com.orbekk.same.http.RpcServlet;
-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 java.util.ArrayList;
import java.util.List;
@@ -20,13 +20,13 @@ import org.junit.Test;
public class PaxosServiceFunctionalTest {
ConnectionManagerImpl connections = new ConnectionManagerImpl(500, 500);
List<String> paxosUrls = new ArrayList<String>();
- ServerContainer server;
+ JettyServerContainer server;
String myUrl;
int successfulProposals = 0;
@Before
public void setUp() throws Exception {
- ServerBuilder builder = new ServerBuilder(0);
+ JettyServerBuilder builder = new JettyServerBuilder(0);
List<String> tempUrls = setupPaxos(builder, 10);
server = builder.build();
server.start();
@@ -40,7 +40,7 @@ public class PaxosServiceFunctionalTest {
server.stop();
}
- public List<String> setupPaxos(ServerBuilder builder, int instances) {
+ public List<String> setupPaxos(JettyServerBuilder builder, int instances) {
List<String> tempUrls = new ArrayList<String>();
for (int i = 1; i <= instances; i++) {
JsonRpcServer jsonServer = new JsonRpcServer(