diff --git a/build.sh b/build.sh
index 5fd88bcd93de9724be3568d4513a87ecb5d0fe94..cf874db1b7079a0b1fd49da3d211803de48b5fcc 100755
--- a/build.sh
+++ b/build.sh
@@ -36,5 +36,15 @@ if [ $? -ne 0 ]; then
exit 1
fi
+echo "" >> $LOG
+echo "-------------------------------" >> $LOG
+echo "compiling vipra-cmd" | tee -a $LOG
+echo "-------------------------------" >> $LOG
+$MVN -f ./vipra-cmd/pom.xml package >> $LOG 2>&1
+if [ $? -ne 0 ]; then
+ echo "error"
+ exit 1
+fi
+
echo "complete"
exit $?
diff --git a/vipra-cmd.sh b/vipra-cmd.sh
index ec119e111d6be96e99fbcf5cae6a84a5453843e7..3661a013e1960d9ae73c44383964b4a35e61889b 100755
--- a/vipra-cmd.sh
+++ b/vipra-cmd.sh
@@ -9,8 +9,8 @@ fi
# path
SCRIPTFILE="$(basename $0)"
-JAR="vipra-cmd.jar"
-DIR="./vipra-cmd/bin"
+JAR="cmd-0.0.1-SNAPSHOT.jar"
+DIR="./vipra-cmd/target"
JARFILE="$DIR/$JAR"
# check if jar exists
diff --git a/vipra-cmd/.classpath b/vipra-cmd/.classpath
index 4b6b27664bf27624189421ebc42d984b75d9e8d1..24f51ca2c6aa22680ae5cbb790e66ec176e43965 100644
--- a/vipra-cmd/.classpath
+++ b/vipra-cmd/.classpath
@@ -22,11 +22,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/vipra-cmd/.settings/org.eclipse.core.resources.prefs b/vipra-cmd/.settings/org.eclipse.core.resources.prefs
index 839d647eef851c560a9854ff81d9caa1df594ced..abdea9ac032d4655898933f93050f48bf9581d14 100644
--- a/vipra-cmd/.settings/org.eclipse.core.resources.prefs
+++ b/vipra-cmd/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,4 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
diff --git a/vipra-cmd/build.xml b/vipra-cmd/build.xml
deleted file mode 100644
index 54fb322d91e52e72979db75fe109199db9c44037..0000000000000000000000000000000000000000
--- a/vipra-cmd/build.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="create_run_jar" name="Create Runnable Jar for Project vipra-cmd with libraries in sub-folder">
- <!--this file was created by Eclipse Runnable JAR Export Wizard-->
- <!--ANT 1.7 is required -->
- <!--define folder properties-->
- <property name="dir.buildfile" value="."/>
- <property name="dir.workspace" value="/home/eike/workspace"/>
- <property name="dir.jarfile" value="${dir.buildfile}/bin"/>
- <target name="create_run_jar">
- <jar destfile="${dir.jarfile}/vipra-cmd.jar">
- <manifest>
- <attribute name="Main-Class" value="de.vipra.cmd.Main"/>
- <attribute name="Class-Path" value=". vipra-cmd_lib/commons-cli-1.3.1.jar vipra-cmd_lib/json-simple-1.1.1.jar vipra-cmd_lib/junit-4.10.jar vipra-cmd_lib/hamcrest-core-1.1.jar vipra-cmd_lib/elasticsearch-2.1.0.jar vipra-cmd_lib/lucene-core-5.3.1.jar vipra-cmd_lib/lucene-backward-codecs-5.3.1.jar vipra-cmd_lib/lucene-analyzers-common-5.3.1.jar vipra-cmd_lib/lucene-queries-5.3.1.jar vipra-cmd_lib/lucene-memory-5.3.1.jar vipra-cmd_lib/lucene-highlighter-5.3.1.jar vipra-cmd_lib/lucene-queryparser-5.3.1.jar vipra-cmd_lib/lucene-sandbox-5.3.1.jar vipra-cmd_lib/lucene-suggest-5.3.1.jar vipra-cmd_lib/lucene-misc-5.3.1.jar vipra-cmd_lib/lucene-join-5.3.1.jar vipra-cmd_lib/lucene-grouping-5.3.1.jar vipra-cmd_lib/lucene-spatial-5.3.1.jar vipra-cmd_lib/lucene-spatial3d-5.3.1.jar vipra-cmd_lib/spatial4j-0.4.1.jar vipra-cmd_lib/guava-18.0.jar vipra-cmd_lib/hppc-0.7.1.jar vipra-cmd_lib/joda-time-2.8.2.jar vipra-cmd_lib/joda-convert-1.2.jar vipra-cmd_lib/jackson-core-2.6.2.jar vipra-cmd_lib/jackson-dataformat-smile-2.6.2.jar vipra-cmd_lib/jackson-dataformat-yaml-2.6.2.jar vipra-cmd_lib/snakeyaml-1.15.jar vipra-cmd_lib/jackson-dataformat-cbor-2.6.2.jar vipra-cmd_lib/netty-3.10.5.Final.jar vipra-cmd_lib/compress-lzf-1.0.2.jar vipra-cmd_lib/t-digest-3.0.jar vipra-cmd_lib/HdrHistogram-2.1.6.jar vipra-cmd_lib/jsr166e-1.1.0.jar vipra-cmd_lib/stanford-corenlp-3.6.0.jar vipra-cmd_lib/xom-1.2.10.jar vipra-cmd_lib/xml-apis-1.3.03.jar vipra-cmd_lib/xercesImpl-2.8.0.jar vipra-cmd_lib/xalan-2.7.0.jar vipra-cmd_lib/jollyday-0.4.7.jar vipra-cmd_lib/jaxb-api-2.2.7.jar vipra-cmd_lib/ejml-0.23.jar vipra-cmd_lib/javax.json-api-1.0.jar vipra-cmd_lib/slf4j-api-1.7.12.jar vipra-cmd_lib/stanford-corenlp-3.6.0-models.jar vipra-cmd_lib/log4j-api-2.5.jar vipra-cmd_lib/log4j-core-2.5.jar vipra-cmd_lib/log4j-slf4j-impl-2.5.jar vipra-cmd_lib/morphia-1.1.0.jar vipra-cmd_lib/mongo-java-driver-3.0.2.jar vipra-cmd_lib/proxytoys-1.0.jar vipra-cmd_lib/cglib-nodep-2.2.2.jar vipra-cmd_lib/morphia-logging-slf4j-1.1.0.jar vipra-cmd_lib/commons-io-2.4.jar vipra-cmd_lib/jackson-databind-2.7.0.jar vipra-cmd_lib/jackson-annotations-2.7.0.jar vipra-cmd_lib/args4j-2.32.jar"/>
- </manifest>
- <fileset dir="${dir.buildfile}/target/classes"/>
- <fileset dir="/home/eike/repos/master/ma-impl/vipra-util/target/classes"/>
- <fileset dir="/home/eike/repos/master/ma-impl/jgibblda/target/classes"/>
- </jar>
- <delete dir="${dir.jarfile}/vipra-cmd_lib"/>
- <mkdir dir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/commons-cli/commons-cli/1.3.1/commons-cli-1.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/junit/junit/4.10/junit-4.10.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/elasticsearch/elasticsearch/2.1.0/elasticsearch-2.1.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-core/5.3.1/lucene-core-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-backward-codecs/5.3.1/lucene-backward-codecs-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-analyzers-common/5.3.1/lucene-analyzers-common-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-queries/5.3.1/lucene-queries-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-memory/5.3.1/lucene-memory-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-highlighter/5.3.1/lucene-highlighter-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-queryparser/5.3.1/lucene-queryparser-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-sandbox/5.3.1/lucene-sandbox-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-suggest/5.3.1/lucene-suggest-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-misc/5.3.1/lucene-misc-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-join/5.3.1/lucene-join-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-grouping/5.3.1/lucene-grouping-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-spatial/5.3.1/lucene-spatial-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/lucene/lucene-spatial3d/5.3.1/lucene-spatial3d-5.3.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/spatial4j/spatial4j/0.4.1/spatial4j-0.4.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/google/guava/guava/18.0/guava-18.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/carrotsearch/hppc/0.7.1/hppc-0.7.1.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/joda-time/joda-time/2.8.2/joda-time-2.8.2.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/joda/joda-convert/1.2/joda-convert-1.2.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.6.2/jackson-core-2.6.2.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.6.2/jackson-dataformat-smile-2.6.2.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.6.2/jackson-dataformat-yaml-2.6.2.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/yaml/snakeyaml/1.15/snakeyaml-1.15.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.6.2/jackson-dataformat-cbor-2.6.2.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/io/netty/netty/3.10.5.Final/netty-3.10.5.Final.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/ning/compress-lzf/1.0.2/compress-lzf-1.0.2.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/tdunning/t-digest/3.0/t-digest-3.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/hdrhistogram/HdrHistogram/2.1.6/HdrHistogram-2.1.6.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/twitter/jsr166e/1.1.0/jsr166e-1.1.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/edu/stanford/nlp/stanford-corenlp/3.6.0/stanford-corenlp-3.6.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/io7m/xom/xom/1.2.10/xom-1.2.10.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/de/jollyday/jollyday/0.4.7/jollyday-0.4.7.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/javax/xml/bind/jaxb-api/2.2.7/jaxb-api-2.2.7.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/googlecode/efficient-java-matrix-library/ejml/0.23/ejml-0.23.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/javax/json/javax.json-api/1.0/javax.json-api-1.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/edu/stanford/nlp/stanford-corenlp/3.6.0/stanford-corenlp-3.6.0-models.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/logging/log4j/log4j-api/2.5/log4j-api-2.5.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/logging/log4j/log4j-core/2.5/log4j-core-2.5.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/apache/logging/log4j/log4j-slf4j-impl/2.5/log4j-slf4j-impl-2.5.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/mongodb/morphia/morphia/1.1.0/morphia-1.1.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/mongodb/mongo-java-driver/3.0.2/mongo-java-driver-3.0.2.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/thoughtworks/proxytoys/proxytoys/1.0/proxytoys-1.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/org/mongodb/morphia/morphia-logging-slf4j/1.1.0/morphia-logging-slf4j-1.1.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/commons-io/commons-io/2.4/commons-io-2.4.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.7.0/jackson-databind-2.7.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.7.0/jackson-annotations-2.7.0.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- <copy file="/home/eike/.m2/repository/args4j/args4j/2.32/args4j-2.32.jar" todir="${dir.jarfile}/vipra-cmd_lib"/>
- </target>
-</project>
diff --git a/vipra-cmd/pom.xml b/vipra-cmd/pom.xml
index 39fe21d5384db734c6ef5e55d130c4d37836b9ef..4fdc5febca5416991630f86d1235b5d1c6233022 100644
--- a/vipra-cmd/pom.xml
+++ b/vipra-cmd/pom.xml
@@ -97,25 +97,36 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.4.3</version>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
<executions>
<execution>
+ <id>copy-dependencies</id>
<phase>package</phase>
<goals>
- <goal>shade</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>de.vipra.cmd.Main</mainClass>
- </transformer>
- </transformers>
+ <outputDirectory>${project.build.directory}/lib/</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ <mainClass>de.vipra.cmd.Main</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>