# HG changeset patch # User sugi # Date 1418022027 -32400 # Node ID 08a14d094d028edddcf7af0910b56e8e0d0aa5ca # Parent 5e20f680d6d080fc110ab1a80aba4111f7b47557 add debug option diff -r 5e20f680d6d0 -r 08a14d094d02 build.gradle --- a/build.gradle Sun Dec 07 18:31:36 2014 +0900 +++ b/build.gradle Mon Dec 08 16:00:27 2014 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/8991fa20f32f/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/ba8551c1a5c2/' } } diff -r 5e20f680d6d0 -r 08a14d094d02 src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.java Sun Dec 07 18:31:36 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.java Mon Dec 08 16:00:27 2014 +0900 @@ -3,14 +3,16 @@ import alice.topology.node.TopologyNodeConfig; public class AliceVNCConfig extends TopologyNodeConfig { - private boolean change = true; + private boolean debug = false; public AliceVNCConfig(String[] args) { super(args); for (int i = 0; i< args.length; i++) { if ("-c".equals(args[i])) { change = false; + } else if ("--debug".equals(args[i])) { + debug = true; } } } @@ -18,4 +20,8 @@ public boolean getAllowChange(){ return change; } + + public boolean debugMode(){ + return debug; + } } diff -r 5e20f680d6d0 -r 08a14d094d02 src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Sun Dec 07 18:31:36 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Mon Dec 08 16:00:27 2014 +0900 @@ -8,13 +8,18 @@ public static void main(String args[]){ AliceVNCConfig conf = new AliceVNCConfig(args); AliceVNC cs = new AliceVNC(conf); - if (conf.getManagerHostName() !=null){ - new TopologyNode(conf, cs); - } else { + if (conf.debugMode()) { cs.ods.put("_CLIST", new ArrayList()); cs.ods.put("host", "node0"); cs.execute(); + return; } + + if (conf.getManagerHostName() ==null){ + conf.setManagerHostName("firefly.cr.ie.u-ryukyu.ac.jp"); + } + + new TopologyNode(conf, cs); } }