Mercurial > hg > Database > Alice
changeset 625:4835788cbb7e dispose
fix TestRemote default arguments
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 22 Aug 2017 15:58:18 +0900 |
| parents | ec1980428281 |
| children | 0960dd991266 |
| files | Alice.iml build.gradle src/main/java/alice/daemon/IncomingTcpConnection.java src/main/java/alice/test/codesegment/remote/TestRemoteConfig.java |
| diffstat | 4 files changed, 14 insertions(+), 147 deletions(-) [+] |
line wrap: on
line diff
--- a/Alice.iml Tue Aug 08 16:26:33 2017 +0900 +++ b/Alice.iml Tue Aug 22 15:58:18 2017 +0900 @@ -1,153 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <module external.linked.project.id="Alice" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="cr.ie.u_ryukyu.ac.jp" external.system.module.version="1.1" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/build/classes/main" /> - <output-test url="file://$MODULE_DIR$/build/classes/test" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/build" /> - <excludeFolder url="file://$MODULE_DIR$/out" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module-library"> - <library name="Gradle: com.alexmerz.graphviz"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/com.alexmerz.graphviz.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: commons-lang3-3.3.2"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/commons-lang3-3.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: j3dcore"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/j3dcore.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: j3dutils"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/j3dutils.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: javassist"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/javassist.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: jimColModelImporterJFX"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jimColModelImporterJFX.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: jimObjModelImporterJFX"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jimObjModelImporterJFX.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: log4j-1.2.16"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/log4j-1.2.16.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: msgpack-0.6.13-SNAPSHOT-sources"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/msgpack-0.6.13-SNAPSHOT-sources.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: msgpack-0.6.13-SNAPSHOT"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/msgpack-0.6.13-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: slf4j-api-1.6.1-sources"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/slf4j-api-1.6.1-sources.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: slf4j-api-1.6.1"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/slf4j-api-1.6.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: slf4j-log4j12-1.6.1-sources"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/slf4j-log4j12-1.6.1-sources.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: slf4j-log4j12-1.6.1"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/slf4j-log4j12-1.6.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="Gradle: vecmath"> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/vecmath.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> </component> </module> \ No newline at end of file
--- a/build.gradle Tue Aug 08 16:26:33 2017 +0900 +++ b/build.gradle Tue Aug 22 15:58:18 2017 +0900 @@ -18,7 +18,7 @@ compile fileTree(dir: 'lib', include: '*.jar') compile group: 'com.massisframework.j3d', name: 'java3d-core', version: '1.6.0' compile group: 'com.massisframework.j3d', name: 'vecmath', version: '1.6.0.1' - compile group: 'org.msgpack', name: 'msgpack', version: '0.6.0' + compile group: 'org.msgpack', name: 'msgpack', version: '0.6.12' } jar { @@ -31,7 +31,7 @@ } ext { - mavenRepository = System.getenv()['HTML']+'/maven' + mavenRepository = System.getenv()['CRMAVEN']+'/maven' } uploadArchives {
--- a/src/main/java/alice/daemon/IncomingTcpConnection.java Tue Aug 08 16:26:33 2017 +0900 +++ b/src/main/java/alice/daemon/IncomingTcpConnection.java Tue Aug 22 15:58:18 2017 +0900 @@ -60,7 +60,15 @@ case UPDATE: case PUT: int dataSize = unpacker.readInt(); + rData = new ReceiveData(unpacker.getSerializedByteArray(dataSize), msg.compressed, msg.dataSize); + /* + rData = new ReceiveData(new byte[dataSize], msg.compressed, msg.dataSize); + try { + unpacker.readPayload(rData.getMessagePack()); + } catch ( ); + */ + if (msg.setTime) { rData.setTimes(msg.time, true, msg.depth);
--- a/src/main/java/alice/test/codesegment/remote/TestRemoteConfig.java Tue Aug 08 16:26:33 2017 +0900 +++ b/src/main/java/alice/test/codesegment/remote/TestRemoteConfig.java Tue Aug 22 15:58:18 2017 +0900 @@ -4,9 +4,9 @@ public class TestRemoteConfig extends Config { - public String hostname; + public String hostname = "127.0.0.1"; public int connectPort = 10000; - public String key; + public String key = "remote"; public TestRemoteConfig(String[] args) { super(args);