# HG changeset patch # User Nozomi Teruya # Date 1450355384 -32400 # Node ID c94436e90e9eb8da931a4ebffc613871893a43e8 # Parent 3a27a07277053d025b1085fc5220c9ce60707a22 update Alice r:579 diff -r 3a27a0727705 -r c94436e90e9e .gradle/2.2.1/taskArtifacts/cache.properties.lock Binary file .gradle/2.2.1/taskArtifacts/cache.properties.lock has changed diff -r 3a27a0727705 -r c94436e90e9e .gradle/2.2.1/taskArtifacts/fileHashes.bin Binary file .gradle/2.2.1/taskArtifacts/fileHashes.bin has changed diff -r 3a27a0727705 -r c94436e90e9e .gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary file .gradle/2.2.1/taskArtifacts/fileSnapshots.bin has changed diff -r 3a27a0727705 -r c94436e90e9e .gradle/2.2.1/taskArtifacts/outputFileStates.bin Binary file .gradle/2.2.1/taskArtifacts/outputFileStates.bin has changed diff -r 3a27a0727705 -r c94436e90e9e .gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary file .gradle/2.2.1/taskArtifacts/taskArtifacts.bin has changed diff -r 3a27a0727705 -r c94436e90e9e .idea/workspace.xml --- a/.idea/workspace.xml Thu Dec 17 17:16:07 2015 +0900 +++ b/.idea/workspace.xml Thu Dec 17 21:29:44 2015 +0900 @@ -2,16 +2,9 @@ - - - - - - - - - + + @@ -46,14 +39,44 @@ - - + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -62,21 +85,18 @@ - - - - - - + + + - - + + - - + + @@ -86,30 +106,37 @@ - + + + + + + + + + + + - - + + - - - - - - + + + - - + + - - + + @@ -285,6 +312,9 @@ @@ -405,7 +435,7 @@ - + + + + + + + + + + + @@ -672,23 +736,23 @@ + + - + + - - - @@ -698,18 +762,31 @@ - jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegment.class - 25 - - - jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/LocalDataSegmentManager.class 28 + + jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/StartTopologyNode.class + 25 + + + + jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/TopologyNode.class + 19 + + + + jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegment.class + 18 + + - @@ -742,10 +819,48 @@ + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + @@ -753,38 +868,75 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + - - + + - + - - + + - + - - - - - - + + + + + + + + + + + diff -r 3a27a0727705 -r c94436e90e9e build.gradle --- a/build.gradle Thu Dec 17 17:16:07 2015 +0900 +++ b/build.gradle Thu Dec 17 21:29:44 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/b2eb56ba6bc7/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/6d066093dda2/' } } diff -r 3a27a0727705 -r c94436e90e9e src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.java Thu Dec 17 17:16:07 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.java Thu Dec 17 21:29:44 2015 +0900 @@ -2,6 +2,8 @@ import alice.topology.node.TopologyNodeConfig; +import java.util.LinkedList; + public class AliceVNCConfig extends TopologyNodeConfig { private boolean change = true; private boolean debug = false; diff -r 3a27a0727705 -r c94436e90e9e src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Thu Dec 17 17:16:07 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Thu Dec 17 21:29:44 2015 +0900 @@ -1,9 +1,11 @@ package jp.ac.u_ryukyu.alicevnc; import java.util.ArrayList; +import java.util.LinkedList; import alice.daemon.AliceDaemon; import alice.topology.node.TopologyNode; +import alice.topology.node.TopologyNodeConfig; /** * java -cp AliceVNC.jar alice.topology.manager.TopologyManager @@ -13,9 +15,8 @@ public static void main(String args[]){ AliceVNCConfig conf = new AliceVNCConfig(args); - AliceDaemon aliceDaemon = new AliceDaemon(conf); + AliceVNC cs = new AliceVNC(conf); - AliceVNC cs = new AliceVNC(conf); if (conf.debugMode()) { cs.ods.put("_CLIST", new ArrayList()); cs.ods.put("host", "node0"); @@ -23,11 +24,10 @@ return; } - if (conf.getManagerHostName() ==null){ - conf.setManagerHostName("firefly.cr.ie.u-ryukyu.ac.jp"); - conf.setManagerPort(10000); + LinkedList topologyNodeConfigs = TopologyNodeConfig.MultiTopologyNodeCongingFactory(args); + for(TopologyNodeConfig config : topologyNodeConfigs){ + new TopologyNode(config, cs); } - new TopologyNode(conf, cs); } }