Mercurial > hg > FederatedLinda
changeset 65:cc860e8beb8f
merge
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Thu, 26 Feb 2009 08:46:29 +0900 |
| parents | e56d1f7af5ce (diff) 3e051060d845 (current diff) |
| children | 82a292aa41ad |
| files | build.xml src/fdl/FDLindaServ.java src/fdl/test/metaTransfer/FDLServWithSend.java src/fdl/test/metaTransfer/Ring/FDLServWithSend.java |
| diffstat | 4 files changed, 18 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/build.xml Thu Feb 26 08:22:08 2009 +0900 +++ b/build.xml Thu Feb 26 08:46:29 2009 +0900 @@ -25,7 +25,12 @@ <!-- コンパイル --> <target name="compile"> <mkdir dir="${classes}" /> - <javac srcdir="${src}" destdir="${classes}"/> + <javac encoding="UTF-8" srcdir="src" destdir="${classes}" fork="yes"> + <compilerarg value="-J-Dfile.encoding=UTF8"/> + <sourcepath> + <pathelement path="src"/> + </sourcepath> + </javac> </target> <!-- javadocの作成 --> @@ -41,4 +46,6 @@ <delete dir="${javadoc}" /> <delete file="${jar}" /> </target> -</project> \ No newline at end of file + +</project> +
--- a/src/fdl/FDLindaServ.java Thu Feb 26 08:22:08 2009 +0900 +++ b/src/fdl/FDLindaServ.java Thu Feb 26 08:46:29 2009 +0900 @@ -27,7 +27,6 @@ private ServerSocketChannel ssChannel; public TupleSpace tupleSpace; public MetaEngine me; - public MetaProtocolEngine mpe; public static void main(final String[] args) { final String usages = "usage: FDLindaServ [-p port]";
--- a/src/fdl/test/metaTransfer/FDLServWithSend.java Thu Feb 26 08:22:08 2009 +0900 +++ b/src/fdl/test/metaTransfer/FDLServWithSend.java Thu Feb 26 08:46:29 2009 +0900 @@ -15,8 +15,13 @@ @Override public void mainLoop() { System.out.println("change mainloop"); +<<<<<<< local + MetaLinda ml = new MetaLinda(tupleSpace, this); + MetaProtocolEngine mpe = new MetaProtocolEngine(ml,"MetaEngine", port1); +======= // MetaLinda ml = new MetaLinda(tupleSpace, this); // mpe = new MetaProtocolEngine(ml,"MetaEngine", port1); +>>>>>>> other mpe.mainLoop(); }
--- a/src/fdl/test/metaTransfer/Ring/FDLServWithSend.java Thu Feb 26 08:22:08 2009 +0900 +++ b/src/fdl/test/metaTransfer/Ring/FDLServWithSend.java Thu Feb 26 08:46:29 2009 +0900 @@ -15,7 +15,11 @@ @Override public void mainLoop() { System.out.println("change mainloop"); MetaLinda ml = new MetaLinda(tupleSpace, this); +<<<<<<< local + MetaProtocolEngine mpe = new MetaProtocolEngine(ml,"MetaEngine", port1); +======= mpe = new MetaProtocolEngine(ml,"MetaEngine", port1, port); +>>>>>>> other mpe.mainLoop(); }