diff --git a/.gitignore b/.gitignore index a057f8c..49ccfce 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ my-idx .settings/ .project .classpath +.idea/ +*.iml +dependency-reduced-pom.xml diff --git a/bin/build_sample_index.sh b/bin/build_sample_index.sh index 1dae090..d0e2685 100755 --- a/bin/build_sample_index.sh +++ b/bin/build_sample_index.sh @@ -5,12 +5,10 @@ bin=`cd "$bin"; pwd` lib=$bin/../target/lib dist=$bin/../target -classes=$bin/../target/test-classes HEAP_OPTS="-Xmx1g -Xms1g -XX:NewSize=256m" JAVA_OPTS="-server -d64" MAIN_CLASS="com.senseidb.clue.test.BuildSampleIndex" -CLASSPATH=$resources/:$classes/:$lib/*:$dist/*:$1/ext/* -java $JAVA_OPTS $JMX_OPTS $HEAP_OPTS -classpath $CLASSPATH $MAIN_CLASS $bin/../src/test/resources/cars.json $@ \ No newline at end of file +java $JAVA_OPTS $JMX_OPTS $HEAP_OPTS -cp $dist/clue-6.2.0-0.0.1-SNAPSHOT.jar $MAIN_CLASS $bin/../src/main/resources/cars.json $@ \ No newline at end of file diff --git a/bin/clue.sh b/bin/clue.sh index 491bc76..072f64e 100755 --- a/bin/clue.sh +++ b/bin/clue.sh @@ -12,8 +12,5 @@ HEAP_OPTS="-Xmx1g -Xms1g -XX:NewSize=256m" JAVA_OPTS="-server -d64 -Dhadoop.conf.dir=$HADOOP_CONF_DIR" #JAVA_DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=1044,server=y,suspend=y" -MAIN_CLASS="com.senseidb.clue.ClueApplication" -CLASSPATH=$CLASSPATH:$resources/:$lib/*:$dist/* - -(cd $bin/..; java $JAVA_OPTS $JAVA_DEBUG $HEAP_OPTS -classpath $CLASSPATH $MAIN_CLASS $@) +(cd $bin/..; java $JAVA_OPTS $JAVA_DEBUG $HEAP_OPTS -jar $dist/clue-6.2.0-0.0.1-SNAPSHOT.jar $@) diff --git a/pom.xml b/pom.xml index 06f7648..301c327 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ clue jar clue - 0.0.7-SNAPSHOT + 6.2.0-0.0.1-SNAPSHOT command line client for Apache Lucene http://github.com/javasoze/clue @@ -32,6 +32,12 @@ john.wang@gmail.com + + + UTF-8 + com.senseidb.clue.ClueApplication + 6.2.0 + @@ -40,62 +46,46 @@ maven-compiler-plugin 2.1 - 1.6 - 1.6 + 1.8 + 1.8 UTF-8 - - maven-dependency-plugin - 2.8 - - - package - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - maven-assembly-plugin - 2.4 - - false - ${project.build.directory}/releases/ - clue-all-${project.version} - - jar-with-dependencies - - - - com.senseidb.clue.ClueApplication - com.senseidb.clue - - - - - - make-assembly - package - - single - - - - + + maven-shade-plugin + 2.4.1 + + true + + + + ${mainClass} + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + package + + shade + + + + - - UTF-8 - - 6.2.0 - - org.apache.lucene @@ -107,6 +97,11 @@ lucene-codecs ${lucene.version} + + org.apache.lucene + lucene-backward-codecs + ${lucene.version} + org.apache.lucene lucene-queries @@ -164,7 +159,6 @@ org.json json 20140107 - test jline diff --git a/src/test/java/com/senseidb/clue/test/BuildSampleIndex.java b/src/main/java/com/senseidb/clue/test/BuildSampleIndex.java similarity index 99% rename from src/test/java/com/senseidb/clue/test/BuildSampleIndex.java rename to src/main/java/com/senseidb/clue/test/BuildSampleIndex.java index 8b1e8e7..fae2502 100644 --- a/src/test/java/com/senseidb/clue/test/BuildSampleIndex.java +++ b/src/main/java/com/senseidb/clue/test/BuildSampleIndex.java @@ -85,6 +85,7 @@ static Document buildDoc(JSONObject json) throws Exception{ public static void main(String[] args) throws Exception{ if (args.length != 2) { System.out.println("usage: source_file index_dir"); + System.exit(1); } File f = new File(args[0]); BufferedReader reader = new BufferedReader(new FileReader(f)); diff --git a/src/test/java/com/senseidb/clue/test/PayloadTokenizer.java b/src/main/java/com/senseidb/clue/test/PayloadTokenizer.java similarity index 100% rename from src/test/java/com/senseidb/clue/test/PayloadTokenizer.java rename to src/main/java/com/senseidb/clue/test/PayloadTokenizer.java diff --git a/src/test/resources/cars.json b/src/main/resources/cars.json similarity index 100% rename from src/test/resources/cars.json rename to src/main/resources/cars.json