*/
public class ChimeraManager
{
- private static final boolean debug = true;
+ private static final boolean debug = false;
/*
* true: use REST API (recommended), false: use stdout/stdin (deprecated)
*/
+ // TODO remove once definitely happy with using REST
private static final boolean USE_REST = true;
- // Port number for Chimera REST service
- private int restPort;
+ private int chimeraRestPort;
private Process chimera;
{
chimera = null;
currentModelsMap.clear();
- if (!USE_REST)
+ if (USE_REST)
+ {
+ this.chimeraRestPort = 0;
+ }
+ else
{
chimeraListenerThread.requestStop();
chimeraListenerThread = null;
{
if (USE_REST)
{
- this.restPort = getPortNumber();
+ this.chimeraRestPort = getPortNumber();
+ System.out.println("Chimera REST API on port " + chimeraRestPort);
}
else
{
String [] tokens = response.split(" ");
if (tokens.length == 7 && "port".equals(tokens[5])) {
port = Integer.parseInt(tokens[6]);
- logger.info("Chimera REST service listening on port " + restPort);
+ logger.info("Chimera REST service listening on port "
+ + chimeraRestPort);
}
} catch (Exception e)
{
protected List<String> sendRestCommand(String command)
{
// TODO start a separate thread to do this so we don't block?
- String restUrl = "http://127.0.0.1:" + this.restPort + "/run";
+ String restUrl = "http://127.0.0.1:" + this.chimeraRestPort + "/run";
List<NameValuePair> commands = new ArrayList<NameValuePair>(1);
commands.add(new BasicNameValuePair("command", command));