Mercurial > hg > Members > shoshi > jungle > bulletinboard
changeset 22:94bb2f22dc32
fix bag
author | tatsuki |
---|---|
date | Fri, 24 Oct 2014 18:22:45 +0900 |
parents | 397d4194e746 |
children | 770269200a60 |
files | .classpath pom.xml src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/bbs/JungleBulletinBoard.java src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/bbs/AppTest.java |
diffstat | 4 files changed, 161 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/.classpath Sat Sep 27 19:27:44 2014 +0900 +++ b/.classpath Fri Oct 24 18:22:45 2014 +0900 @@ -1,22 +1,168 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"> + <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry including="**/*.java" kind="src" path="src/main/java"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar" sourcepath="M2_REPO/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java8u5"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/functionaljava/functionaljava/3.1/functionaljava-3.1.jar" sourcepath="M2_REPO/org/functionaljava/functionaljava/3.1/functionaljava-3.1-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/functionaljava/functionaljava/3.1/functionaljava-3.1-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-server/9.1.1.v20140108/jetty-server-9.1.1.v20140108.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-server/9.1.1.v20140108/jetty-server-9.1.1.v20140108-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/eclipse/jetty/jetty-server/9.1.1.v20140108/jetty-server-9.1.1.v20140108-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/9.1.1.v20140108/jetty-http-9.1.1.v20140108.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-http/9.1.1.v20140108/jetty-http-9.1.1.v20140108-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/eclipse/jetty/jetty-http/9.1.1.v20140108/jetty-http-9.1.1.v20140108-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/9.1.1.v20140108/jetty-util-9.1.1.v20140108.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-util/9.1.1.v20140108/jetty-util-9.1.1.v20140108-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/eclipse/jetty/jetty-util/9.1.1.v20140108/jetty-util-9.1.1.v20140108-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/9.1.1.v20140108/jetty-io-9.1.1.v20140108.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-io/9.1.1.v20140108/jetty-io-9.1.1.v20140108-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/eclipse/jetty/jetty-io/9.1.1.v20140108/jetty-io-9.1.1.v20140108-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/org/hectorclient/hector-core/1.1-2/hector-core-1.1-2.jar" sourcepath="M2_REPO/org/hectorclient/hector-core/1.1-2/hector-core-1.1-2-sources.jar"> <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/hectorclient/hector-core/1.1-2/hector-core-1.1-2-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.5.3/commons-pool-1.5.3.jar" sourcepath="M2_REPO/commons-pool/commons-pool/1.5.3/commons-pool-1.5.3-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/commons-pool/commons-pool/1.5.3/commons-pool-1.5.3-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/org/apache/cassandra/cassandra-thrift/1.1.0/cassandra-thrift-1.1.0.jar" sourcepath="M2_REPO/org/apache/cassandra/cassandra-thrift/1.1.0/cassandra-thrift-1.1.0-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/apache/cassandra/cassandra-thrift/1.1.0/cassandra-thrift-1.1.0-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/org/apache/thrift/libthrift/0.7.0/libthrift-0.7.0.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/apache/thrift/libthrift/0.7.0/libthrift-0.7.0-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/r09/guava-r09.jar" sourcepath="M2_REPO/com/google/guava/guava/r09/guava-r09-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/com/google/guava/guava/r09/guava-r09-javadoc.jar!/"/> </attributes> </classpathentry> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <classpathentry kind="var" path="M2_REPO/com/github/stephenc/eaio-uuid/uuid/3.2.0/uuid-3.2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/com/ecyrd/speed4j/speed4j/0.9/speed4j-0.9.jar" sourcepath="M2_REPO/com/ecyrd/speed4j/speed4j/0.9/speed4j-0.9-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/com/ecyrd/speed4j/speed4j/0.9/speed4j-0.9-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/org/apache/cassandra/cassandra-all/1.2.1/cassandra-all-1.2.1.jar" sourcepath="M2_REPO/org/apache/cassandra/cassandra-all/1.2.1/cassandra-all-1.2.1-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/apache/cassandra/cassandra-all/1.2.1/cassandra-all-1.2.1-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/org/xerial/snappy/snappy-java/1.0.4.1/snappy-java-1.0.4.1.jar" sourcepath="M2_REPO/org/xerial/snappy/snappy-java/1.0.4.1/snappy-java-1.0.4.1-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/xerial/snappy/snappy-java/1.0.4.1/snappy-java-1.0.4.1-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/com/ning/compress-lzf/0.8.4/compress-lzf-0.8.4.jar" sourcepath="M2_REPO/com/ning/compress-lzf/0.8.4/compress-lzf-0.8.4-sources.jar"> <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/com/ning/compress-lzf/0.8.4/compress-lzf-0.8.4-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.1/commons-cli-1.1.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.1/commons-cli-1.1-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/commons-cli/commons-cli/1.1/commons-cli-1.1-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/com/googlecode/concurrentlinkedhashmap/concurrentlinkedhashmap-lru/1.3/concurrentlinkedhashmap-lru-1.3.jar" sourcepath="M2_REPO/com/googlecode/concurrentlinkedhashmap/concurrentlinkedhashmap-lru/1.3/concurrentlinkedhashmap-lru-1.3-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/com/googlecode/concurrentlinkedhashmap/concurrentlinkedhashmap-lru/1.3/concurrentlinkedhashmap-lru-1.3-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.2/antlr-3.2.jar" sourcepath="M2_REPO/org/antlr/antlr/3.2/antlr-3.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar" sourcepath="M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/cassandra/deps/avro/1.4.0-cassandra-1/avro-1.4.0-cassandra-1.jar" sourcepath="M2_REPO/org/apache/cassandra/deps/avro/1.4.0-cassandra-1/avro-1.4.0-cassandra-1-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/apache/cassandra/deps/avro/1.4.0-cassandra-1/avro-1.4.0-cassandra-1-javadoc.jar!/"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.9.2/jackson-mapper-asl-1.9.2.jar" sourcepath="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.9.2/jackson-mapper-asl-1.9.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.9.2/jackson-core-asl-1.9.2.jar" sourcepath="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.9.2/jackson-core-asl-1.9.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1.22/jetty-6.1.22.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1.22/jetty-util-6.1.22.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar" sourcepath="M2_REPO/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211-sources.jar"> <attributes> - <attribute name="maven.pomderived" value="true"/> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/jline/jline/1.0/jline-1.0.jar" sourcepath="M2_REPO/jline/jline/1.0/jline-1.0-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/jline/jline/1.0/jline-1.0-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.jar" sourcepath="M2_REPO/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/github/stephenc/high-scale-lib/high-scale-lib/1.1.2/high-scale-lib-1.1.2.jar" sourcepath="M2_REPO/com/github/stephenc/high-scale-lib/high-scale-lib/1.1.2/high-scale-lib-1.1.2-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/com/github/stephenc/high-scale-lib/high-scale-lib/1.1.2/high-scale-lib-1.1.2-javadoc.jar!/"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="var" path="M2_REPO/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" sourcepath="M2_REPO/org/yaml/snakeyaml/1.6/snakeyaml-1.6-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/org/yaml/snakeyaml/1.6/snakeyaml-1.6-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/edu/stanford/ppl/snaptree/0.1/snaptree-0.1.jar" sourcepath="M2_REPO/edu/stanford/ppl/snaptree/0.1/snaptree-0.1-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/edu/stanford/ppl/snaptree/0.1/snaptree-0.1-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/com/yammer/metrics/metrics-core/2.0.3/metrics-core-2.0.3.jar" sourcepath="M2_REPO/com/yammer/metrics/metrics-core/2.0.3/metrics-core-2.0.3-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/com/yammer/metrics/metrics-core/2.0.3/metrics-core-2.0.3-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar" sourcepath="M2_REPO/com/github/stephenc/jamm/0.2.5/jamm-0.2.5-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:file:/Users/one/.m2/repository/com/github/stephenc/jamm/0.2.5/jamm-0.2.5-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="var" path="M2_REPO/com/eaio/uuid/uuid/3.3/uuid-3.3.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/jungle-core"/> <classpathentry kind="output" path="target/classes"/> </classpath>
--- a/pom.xml Sat Sep 27 19:27:44 2014 +0900 +++ b/pom.xml Fri Oct 24 18:22:45 2014 +0900 @@ -21,6 +21,11 @@ <version>3.8.1</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.functionaljava</groupId> + <artifactId>functionaljava</artifactId> + <version>3.1</version> + </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId>
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/bbs/JungleBulletinBoard.java Sat Sep 27 19:27:44 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/bbs/JungleBulletinBoard.java Fri Oct 24 18:22:45 2014 +0900 @@ -21,8 +21,6 @@ import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.IterableConverter; -import jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.store.index.Logging; -import jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.store.index.LoggingIndexNode; public class JungleBulletinBoard implements BulletinBoard {
--- a/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/bbs/AppTest.java Sat Sep 27 19:27:44 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/bbs/AppTest.java Fri Oct 24 18:22:45 2014 +0900 @@ -1,5 +1,6 @@ package jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs; + import fj.P2; import fj.data.List; import junit.framework.Test;