Merge pull request #1 from mcroydon/master

Build and example fixes
apache · Oct 24, 2012 · c8f549f · c8f549f
2 parents 631c3bf + 9575326
commit c8f549f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,5 @@ target
 client/.settings/org.eclipse.jdt.core.prefs
 common/.settings/org.eclipse.jdt.core.prefs
 server/.settings/org.eclipse.jdt.core.prefs
+examples/rand/RealtimeNode.out
+examples/twitter/RealtimeNode.out
diff --git a/examples/rand/run_client.sh b/examples/rand/run_client.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 echo "  commandline query to RealtimeStandaloneMain service using curl"
-echo "    before running this, do:  run_server.sh &"
+echo "    before running this, do:  run_server.sh"
 
 set +u
 shopt -s xpg_echo

diff --git a/examples/rand/run_server.sh b/examples/rand/run_server.sh
@@ -15,7 +15,7 @@ echo "cleaning up previous run, if any"
 
 #  start RealtimeNode process
 #
-java -Xmx400m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath target/druid-examples-rand-2.5.72-SNAPSHOT-selfcontained.jar  druid.examples.RealtimeStandaloneMain  >RealtimeNode.out 2>&1  &
+java -Xmx400m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath target/druid-examples-rand-*-selfcontained.jar  druid.examples.RealtimeStandaloneMain  >RealtimeNode.out 2>&1  &
 PID=$!
 
 trap "kill $PID" 1 2 3 15

diff --git a/examples/twitter/run_client.sh b/examples/twitter/run_client.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 echo "  commandline query to RealtimeStandaloneMain service using curl"
-echo "    before running this, do:  run_server.sh &"
+echo "    before running this, do:  run_server.sh"
 
 set +u
 shopt -s xpg_echo

diff --git a/server/src/main/java/com/metamx/druid/index/v1/IndexMerger.java b/server/src/main/java/com/metamx/druid/index/v1/IndexMerger.java
@@ -57,7 +57,6 @@
 import com.metamx.druid.kv.VSizeIndexedWriter;
 import com.metamx.druid.utils.JodaUtils;
 import com.metamx.druid.utils.SerializerUtils;
-import com.sun.tools.javac.resources.version;
 import it.uniroma3.mat.extendedset.intset.ConciseSet;
 import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet;
 import org.apache.commons.io.FileUtils;