# HG changeset patch # User one # Date 1385417496 -32400 # Node ID f42f2e6b31de747582fa995e4153b19dd47289c2 # Parent f9e29a52efd3fece70a75640c9c9e284cf84e115 Removed project reference and Added dependency in pom.xml diff -r f9e29a52efd3 -r f42f2e6b31de .classpath --- a/.classpath Tue Nov 26 06:43:10 2013 +0900 +++ b/.classpath Tue Nov 26 07:11:36 2013 +0900 @@ -1,51 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r f9e29a52efd3 -r f42f2e6b31de pom.xml --- a/pom.xml Tue Nov 26 06:43:10 2013 +0900 +++ b/pom.xml Tue Nov 26 07:11:36 2013 +0900 @@ -89,20 +89,19 @@ functionaljava 3.1 - - jungle jungle-core diff -r f9e29a52efd3 -r f42f2e6b31de src/main/java/alice/jungle/persistent/PersistentChangeListReader.java --- a/src/main/java/alice/jungle/persistent/PersistentChangeListReader.java Tue Nov 26 06:43:10 2013 +0900 +++ b/src/main/java/alice/jungle/persistent/PersistentChangeListReader.java Tue Nov 26 07:11:36 2013 +0900 @@ -4,16 +4,15 @@ import java.io.IOException; import java.io.InputStream; -import alice.jungle.operations.NetworkTreeOperationLog; - import org.msgpack.MessagePack; +import alice.jungle.operations.NetworkTreeOperationLog; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeList; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeListReader; public class PersistentChangeListReader implements ChangeListReader { - private static InputStream in; + private InputStream in; MessagePack msgpack = PersistentJournal.getMessagePack(); public PersistentChangeListReader() { diff -r f9e29a52efd3 -r f42f2e6b31de src/main/java/alice/jungle/remote/RemoteConfig.java --- a/src/main/java/alice/jungle/remote/RemoteConfig.java Tue Nov 26 06:43:10 2013 +0900 +++ b/src/main/java/alice/jungle/remote/RemoteConfig.java Tue Nov 26 07:11:36 2013 +0900 @@ -1,4 +1,5 @@ package alice.jungle.remote; + import alice.topology.node.TopologyNodeConfig; diff -r f9e29a52efd3 -r f42f2e6b31de src/main/java/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java --- a/src/main/java/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java Tue Nov 26 06:43:10 2013 +0900 +++ b/src/main/java/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java Tue Nov 26 07:11:36 2013 +0900 @@ -189,6 +189,6 @@ NetworkTreeOperationLog netLog = new NetworkTreeOperationLog(_uuid, _treeName,newLog); NullCodeSegment cs = new NullCodeSegment(); cs.ods.put("log", netLog); - cs.execute(); /* Do nothing CodeSegment */ + cs.execute(); } } diff -r f9e29a52efd3 -r f42f2e6b31de src/main/java/jungle/app/bbs/DistributeApp.java --- a/src/main/java/jungle/app/bbs/DistributeApp.java Tue Nov 26 06:43:10 2013 +0900 +++ b/src/main/java/jungle/app/bbs/DistributeApp.java Tue Nov 26 07:11:36 2013 +0900 @@ -2,8 +2,8 @@ import alice.jungle.remote.RemoteConfig; +import alice.topology.node.TopologyNode; import jungle.app.bbs.codesegment.StartBBSCodeSegment; -import alice.topology.node.TopologyNode; public class DistributeApp diff -r f9e29a52efd3 -r f42f2e6b31de src/main/java/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java --- a/src/main/java/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java Tue Nov 26 06:43:10 2013 +0900 +++ b/src/main/java/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java Tue Nov 26 07:11:36 2013 +0900 @@ -4,14 +4,14 @@ import java.util.List; +import alice.codesegment.CodeSegment; +import alice.datasegment.CommandType; +import alice.datasegment.Receiver; import alice.jungle.operations.NetworkTreeOperationLog; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTreeEditor; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error; import jungle.app.bbs.JungleManager; -import alice.codesegment.CodeSegment; -import alice.datasegment.CommandType; -import alice.datasegment.Receiver; public class LogUpdateCodeSegment extends CodeSegment { diff -r f9e29a52efd3 -r f42f2e6b31de src/main/java/jungle/app/bbs/codesegment/NullCodeSegment.java --- a/src/main/java/jungle/app/bbs/codesegment/NullCodeSegment.java Tue Nov 26 06:43:10 2013 +0900 +++ b/src/main/java/jungle/app/bbs/codesegment/NullCodeSegment.java Tue Nov 26 07:11:36 2013 +0900 @@ -2,6 +2,7 @@ import alice.codesegment.CodeSegment; + public class NullCodeSegment extends CodeSegment { @Override diff -r f9e29a52efd3 -r f42f2e6b31de src/main/java/jungle/app/bbs/codesegment/StartBBSCodeSegment.java --- a/src/main/java/jungle/app/bbs/codesegment/StartBBSCodeSegment.java Tue Nov 26 06:43:10 2013 +0900 +++ b/src/main/java/jungle/app/bbs/codesegment/StartBBSCodeSegment.java Tue Nov 26 07:11:36 2013 +0900 @@ -12,7 +12,6 @@ import jungle.app.bbs.NetworkJungleBulletinBoard; import jungle.app.bbs.ShowBoardMessageServlet; import jungle.app.bbs.ShowBoardsServlet; -import alice.jungle.datasegment.store.HashSetDataSegment; import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.ServletHandler; @@ -22,6 +21,7 @@ import alice.datasegment.CommandType; import alice.datasegment.Receiver; + public class StartBBSCodeSegment extends CodeSegment { int bbsPort = 8080;