summaryrefslogtreecommitdiff
path: root/same/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'same/src/main')
-rw-r--r--same/src/main/java/com/orbekk/same/App.java43
-rw-r--r--same/src/main/java/com/orbekk/same/Client.java62
-rw-r--r--same/src/main/java/com/orbekk/same/SameService.java40
-rw-r--r--same/src/main/java/com/orbekk/same/SameServiceImpl.java60
-rw-r--r--same/src/main/java/com/orbekk/same/SameState.java233
5 files changed, 0 insertions, 438 deletions
diff --git a/same/src/main/java/com/orbekk/same/App.java b/same/src/main/java/com/orbekk/same/App.java
deleted file mode 100644
index 5d94678..0000000
--- a/same/src/main/java/com/orbekk/same/App.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.orbekk.same;
-
-import com.googlecode.jsonrpc4j.JsonRpcServer;
-import org.eclipse.jetty.server.Server;
-
-public class App {
- public static void main(String[] args) {
- if (args.length < 3) {
- System.err.println("Arguments: port networkName clientId");
- System.exit(1);
- }
- int port = Integer.parseInt(args[0]);
- String networkName = args[1];
- String clientId = args[2];
-
- ConnectionManagerImpl connections = new ConnectionManagerImpl();
-
- SameState sameState = new SameState(networkName, clientId,
- connections);
- sameState.start();
-
- SameServiceImpl service = new SameServiceImpl(sameState);
- JsonRpcServer jsonServer = new JsonRpcServer(service,
- SameService.class);
-
- Server server = new Server(port);
- RpcHandler rpcHandler = new RpcHandler(jsonServer, sameState);
- server.setHandler(rpcHandler);
-
- try {
- server.start();
- } catch (Exception e) {
- System.out.println("Could not start jetty server.");
- e.printStackTrace();
- }
-
- try {
- server.join();
- } catch (InterruptedException e) {
- System.out.println("Interrupt");
- }
- }
-}
diff --git a/same/src/main/java/com/orbekk/same/Client.java b/same/src/main/java/com/orbekk/same/Client.java
deleted file mode 100644
index 11a7449..0000000
--- a/same/src/main/java/com/orbekk/same/Client.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.orbekk.same;
-
-import com.googlecode.jsonrpc4j.JsonRpcServer;
-import com.orbekk.net.HttpUtil;
-import org.eclipse.jetty.server.Server;
-
-public class Client {
-
- public static void main(String[] args) {
- if (args.length < 4) {
- System.err.println("Arguments: port clientId thisNetworkName " +
- "remoteNetworkAddr");
- System.exit(1);
- }
- int port = Integer.parseInt(args[0]);
- String clientId = args[1];
- String networkName = args[2];
- String remoteAddr = args[3];
-
- ConnectionManagerImpl connections = new ConnectionManagerImpl();
-
- SameState sameState = new SameState(networkName, clientId,
- connections);
- sameState.start();
-
- SameServiceImpl service = new SameServiceImpl(sameState);
- JsonRpcServer jsonServer = new JsonRpcServer(service,
- SameService.class);
-
- Server server = new Server(port);
- RpcHandler rpcHandler = new RpcHandler(jsonServer, sameState);
- server.setHandler(rpcHandler);
-
- try {
- server.start();
- } catch (Exception e) {
- System.out.println("Could not start jetty server.");
- e.printStackTrace();
- }
-
- while (sameState.getUrl() == null) {
- HttpUtil.sendHttpRequest(remoteAddr + "ping?port=" + port);
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- // Ignore interrupt in wait loop.
- }
- }
-
- SameService remoteService = connections.getConnection(remoteAddr);
- remoteService.notifyNetwork("NoNetwork");
- remoteService.participateNetwork("FirstNetwork",
- sameState.getClientId(), sameState.getUrl());
-
- try {
- server.join();
- } catch (InterruptedException e) {
- System.out.println("Interrupt");
- }
-
- }
-}
diff --git a/same/src/main/java/com/orbekk/same/SameService.java b/same/src/main/java/com/orbekk/same/SameService.java
deleted file mode 100644
index 8f239da..0000000
--- a/same/src/main/java/com/orbekk/same/SameService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.orbekk.same;
-
-import java.util.Map;
-
-public interface SameService {
- /**
- * A notification that 'networkName' exists.
- *
- * This is called by any participant of a network after a broadcast
- * has been performed.
- */
- void notifyNetwork(String networkName);
-
- /**
- * A request from the callee to participate in 'networkName'.
- */
- void participateNetwork(String networkName, String clientId, String url);
-
- /**
- * Notification of participation in network.
- */
- void notifyParticipation(String networkName, String masterId);
-
- /**
- * New state.
- *
- * When sent to a non-master from the master, use 'newState' as the
- * current state.
- *
- * When sent to a master, broadcast the new state to all clients.
- */
- void setState(String newState);
-
- /**
- * Notify all nodes of network participants.
- *
- * Only sent from master to non-master.
- */
- void setParticipants(Map<String, String> participants);
-}
diff --git a/same/src/main/java/com/orbekk/same/SameServiceImpl.java b/same/src/main/java/com/orbekk/same/SameServiceImpl.java
deleted file mode 100644
index 27579b5..0000000
--- a/same/src/main/java/com/orbekk/same/SameServiceImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.orbekk.same;
-
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SameServiceImpl implements SameService {
- private Logger logger = LoggerFactory.getLogger(getClass());
- private SameState sameState;
-
- public SameServiceImpl(SameState sameState) {
- this.sameState = sameState;
- }
-
- @Override
- public void notifyNetwork(String networkName) {
- logger.info("Notification from network " + networkName);
- }
-
- @Override
- public void participateNetwork(String networkName, String clientId,
- String url) {
- if (!networkName.equals(sameState.getNetworkName())) {
- logger.warn("Client tried to join {}, but network name is {}.",
- networkName, sameState.getNetworkName());
- return;
- }
- if (clientId.equals("") || url.equals("")) {
- logger.warn("Missing client info: ClientId({}), URL({}).",
- clientId, url);
- return;
- }
- sameState.addParticipant(clientId, url);
- }
-
- @Override
- public void notifyParticipation(String networkName, String masterId) {
- logger.info("Joining network {}. Master is {}", networkName, masterId);
- // int i = 1;
- // for (Map.Entry<String, String> e : participants.entrySet()) {
- // String clientId = e.getKey();
- // String url = e.getValue();
- // logger.info(" {} participant {}: {}, {}",
- // new Object[]{networkName, i, clientId, url});
- // i++;
- // }
- sameState.joinNetwork(networkName, masterId);
- }
-
- @Override
- public void setParticipants(Map<String, String> participants) {
- sameState.setParticipants(participants);
- }
-
- @Override
- public void setState(String newState) {
- sameState.setState(newState);
- }
-}
diff --git a/same/src/main/java/com/orbekk/same/SameState.java b/same/src/main/java/com/orbekk/same/SameState.java
deleted file mode 100644
index 369c5d7..0000000
--- a/same/src/main/java/com/orbekk/same/SameState.java
+++ /dev/null
@@ -1,233 +0,0 @@
-// package com.orbekk.same;
-//
-// import java.util.List;
-// import java.util.LinkedList;
-// import java.util.Map;
-// import java.util.HashMap;
-// import org.slf4j.Logger;
-// import org.slf4j.LoggerFactory;
-//
-// /**
-// * The implementation of a 'Same' state.
-// *
-// * This class manages the current state of the Same protocol.
-// */
-// public class SameState extends Thread implements UrlReceiver {
-// private Logger logger = LoggerFactory.getLogger(getClass());
-// private ConnectionManager connections;
-//
-// // TODO: Change the name of State.
-// private com.orbekk.same.State state =
-// new com.orbekk.same.State();
-//
-// /**
-// * The client id of this participant.
-// */
-// private String clientId;
-//
-// /**
-// * Stopping condition for this thread.
-// */
-// private boolean stopped = false;
-//
-// private String _setState = null;
-// private Map<String, String> _setParticipants = null;
-//
-// private Map<String, String> pendingParticipants =
-// new HashMap<String, String>();
-//
-// public SameState(String networkName, String clientId,
-// ConnectionManager connections) {
-// state.setNetworkName(networkName);
-// this.clientId = clientId;
-// this.connections = connections;
-// state.setMasterId(clientId);
-// state.getParticipants().put(clientId, null);
-// }
-//
-// public String getMasterId() {
-// return state.getMasterId();
-// }
-//
-// public synchronized Map<String, String> getParticipants() {
-// return state.getParticipants();
-// }
-//
-// /**
-// * Reset this SameService to an initial state.
-// *
-// * TODO: Implement fully.
-// */
-// private synchronized void resetState() {
-// state = new com.orbekk.same.State();
-// pendingParticipants.clear();
-// }
-//
-// public synchronized void joinNetwork(String networkName, String masterId) {
-// resetState();
-// state.setNetworkName(networkName);
-// state.setMasterId(masterId);
-// logger.info("Joined network {}.", networkName);
-// }
-//
-// public String getClientId() {
-// return clientId;
-// }
-//
-// public String getNetworkName() {
-// return state.getNetworkName();
-// }
-//
-// public String getCurrentState() {
-// return state.getData();
-// }
-//
-// /**
-// * TODO: Move to a separate library.
-// */
-// public void librarySetNewState(String newState) {
-// connections.getConnection(
-// state.getParticipants().get(state.getMasterId()))
-// .setState(newState);
-// }
-//
-// public String getUrl() {
-// return state.getParticipants().get(clientId);
-// }
-//
-// @Override
-// public void setUrl(String url) {
-// logger.info("My URL is {}", url);
-// state.getParticipants().put(clientId, url);
-// }
-//
-// public synchronized void addParticipant(String clientId, String url) {
-// logger.info("PendingParticipant.add: {} ({})", clientId, url);
-// pendingParticipants.put(clientId, url);
-// notifyAll();
-// }
-//
-// public synchronized void setParticipants(Map<String, String> participants) {
-// logger.info("Pending operation: _setParticipants");
-// _setParticipants = participants;
-// notifyAll();
-// }
-//
-// public synchronized void setState(String newState) {
-// logger.info("Pending operation: _setState");
-// _setState = newState;
-// notifyAll();
-// }
-//
-// private synchronized void handleSetParticipants() {
-// if (_setParticipants != null) {
-// if (isMaster()) {
-// logger.error("{}: Master received setParticipants.", clientId);
-// } else {
-// logger.info("{}: New participants committed.", clientId);
-// state.getParticipants().clear();
-// state.getParticipants().putAll(_setParticipants);
-// }
-// }
-// _setParticipants = null;
-// }
-//
-// public synchronized void handleSetState() {
-// if (_setState != null) {
-// if (isMaster()) {
-// broadcast(new ServiceOperation() {
-// @Override void run(SameService service) {
-// service.setState(_setState);
-// }
-// });
-// }
-// state.setData(_setState);
-// _setState = null;
-// }
-// }
-//
-// private boolean isMaster() {
-// return state.getMasterId().equals(clientId);
-// }
-//
-// private synchronized void handleNewParticipants() {
-// if (!isMaster()) {
-// for (Map.Entry<String, String> e : pendingParticipants.entrySet()) {
-// SameService master = connections.getConnection(
-// state.getParticipants().get(state.getMasterId()));
-// logger.info("Redirecting participant request to {}",
-// state.getMasterId());
-// String clientId = e.getKey();
-// String url = e.getValue();
-// master.participateNetwork(state.getNetworkName(), clientId,
-// url);
-// }
-// } else {
-// state.getParticipants().putAll(pendingParticipants);
-// for (Map.Entry<String, String> e :
-// pendingParticipants.entrySet()) {
-// String clientId = e.getKey();
-// String url = e.getValue();
-// logger.info("New participant: {} URL({})", clientId, url);
-// SameService remoteService = connections.getConnection(url);
-// remoteService.notifyParticipation(state.getNetworkName(),
-// state.getMasterId());
-// broadcast(new ServiceOperation(){
-// @Override void run(SameService service) {
-// service.setParticipants(state.getParticipants());
-// }
-// });
-// }
-// }
-// pendingParticipants.clear();
-// }
-//
-// /**
-// * This method runs the pending commands to SameState.
-// *
-// * It should be called by the worker thread, but can be called directly
-// * for testing purposes to avoid threading in unit tests.
-// */
-// synchronized void internalRun() {
-// handleNewParticipants();
-// handleSetState();
-// handleSetParticipants();
-// }
-//
-// public synchronized void run() {
-// while (!stopped) {
-// internalRun();
-// try {
-// wait(1000);
-// } catch (InterruptedException e) {
-// // Ignore interrupt in wait loop.
-// }
-// }
-// }
-//
-// public synchronized void stopSame() {
-// try {
-// stopped = true;
-// notifyAll();
-// this.join();
-// } catch (InterruptedException e) {
-// logger.warn("Got InterruptedException while waiting for SameState " +
-// "to finish. Ignoring.");
-// }
-// }
-//
-// public abstract static class ServiceOperation {
-// abstract void run(SameService service);
-// }
-//
-// public synchronized void broadcast(ServiceOperation operation) {
-// for (Map.Entry<String, String> e :
-// state.getParticipants().entrySet()) {
-// String clientId = e.getKey();
-// String url = e.getValue();
-// if (!clientId.equals(this.clientId)) {
-// operation.run(connections.getConnection(url));
-// }
-// }
-// }
-// }
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 21:48:27 +0000