diff --git a/build.sh b/build.sh index 120cd36f23672bf314499f598180131db14f6fe3..5fd88bcd93de9724be3568d4513a87ecb5d0fe94 100755 --- a/build.sh +++ b/build.sh @@ -18,22 +18,22 @@ echo using $MVN | tee $LOG echo "" >> $LOG echo "-------------------------------" >> $LOG -echo "compiling vipra-util" | tee -a $LOG +echo "compiling jgibblda" | tee -a $LOG echo "-------------------------------" >> $LOG -$MVN -f ./vipra-util/pom.xml clean compile install >> $LOG 2>&1 +$MVN -f ./jgibblda/pom.xml install >> $LOG 2>&1 if [ $? -ne 0 ]; then - echo "error" - exit 1 + echo "error" + exit 1 fi echo "" >> $LOG echo "-------------------------------" >> $LOG -echo "compiling jgibblda" | tee -a $LOG +echo "compiling vipra-util" | tee -a $LOG echo "-------------------------------" >> $LOG -$MVN -f ./jgibblda/pom.xml clean compile install >> $LOG 2>&1 +$MVN -f ./vipra-util/pom.xml install >> $LOG 2>&1 if [ $? -ne 0 ]; then - echo "error" - exit 1 + echo "error" + exit 1 fi echo "complete" diff --git a/ma-impl.sublime-workspace b/ma-impl.sublime-workspace index e9091f7b9dcda728f180c665f7e0b144b7676580..975b92e6b4c05177da818deb33277708d1e1166a 100644 --- a/ma-impl.sublime-workspace +++ b/ma-impl.sublime-workspace @@ -464,6 +464,7 @@ ], "file_history": [ + "/home/eike/.cache/.fr-kZOCSD/META-INF/MANIFEST.MF", "/home/eike/repos/master/ma-impl/Vagrantfile", "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/topics/index.js", "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/words/index.js", @@ -590,8 +591,7 @@ "/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/app/components/filter-text.js", "/home/eike/Repositories/fu/ss15/ma/impl/vm/webapps/test/index.html", "/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/app/controllers/articles/list.js", - "/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/app/router.js", - "/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/app/index.html" + "/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/app/router.js" ], "find": { diff --git a/vipra-cmd.sh b/vipra-cmd.sh deleted file mode 120000 index 86dc3e356335b615b9df1720bfca8e85fb82d66c..0000000000000000000000000000000000000000 --- a/vipra-cmd.sh +++ /dev/null @@ -1 +0,0 @@ -vipra-cmd/bin/vipra-cmd.sh \ No newline at end of file diff --git a/vipra-cmd.sh b/vipra-cmd.sh new file mode 100755 index 0000000000000000000000000000000000000000..ec119e111d6be96e99fbcf5cae6a84a5453843e7 --- /dev/null +++ b/vipra-cmd.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +# check for java +hash java > /dev/null 2>&1 +if [ $? -ne 0 ]; then + echo "java not found" + exit 1 +fi + +# path +SCRIPTFILE="$(basename $0)" +JAR="vipra-cmd.jar" +DIR="./vipra-cmd/bin" +JARFILE="$DIR/$JAR" + +# check if jar exists +if [ ! -f "$JARFILE" ]; then + echo "executable jar not found. Did you run build.sh?" + exit 1 +fi + +# run +java -jar "$JARFILE" -x "$SCRIPTFILE" "$@" +exit $? diff --git a/vipra-cmd/.settings/org.eclipse.core.resources.prefs b/vipra-cmd/.settings/org.eclipse.core.resources.prefs index abdea9ac032d4655898933f93050f48bf9581d14..839d647eef851c560a9854ff81d9caa1df594ced 100644 --- a/vipra-cmd/.settings/org.eclipse.core.resources.prefs +++ b/vipra-cmd/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ 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/.settings/org.eclipse.wst.common.component b/vipra-cmd/.settings/org.eclipse.wst.common.component index 01821d03fa1d5dca757c51cb0a4e623253b66d6b..ec7635d9ec5720876c9b0971d2e37846e10ffad3 100644 --- a/vipra-cmd/.settings/org.eclipse.wst.common.component +++ b/vipra-cmd/.settings/org.eclipse.wst.common.component @@ -2,6 +2,5 @@ <wb-module deploy-name="vipra-cmd"> <wb-resource deploy-path="/" source-path="/src/main/java"/> <wb-resource deploy-path="/" source-path="/src/main/resources"/> - <wb-resource deploy-path="/" source-path="/src/test/java"/> </wb-module> </project-modules> diff --git a/vipra-cmd/bin/vipra-cmd.sh b/vipra-cmd/bin/vipra-cmd.sh deleted file mode 100755 index 4df9cafbbafa43d8945242a14f5366fea76851a7..0000000000000000000000000000000000000000 --- a/vipra-cmd/bin/vipra-cmd.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -JARFILE="vipra-cmd.jar" -SCRIPTFILE="$(basename $0)" - -# find dir of this script -# from https://stackoverflow.com/questions/59895 -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - SOURCE="$(readlink "$SOURCE")" - [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located -done -DIR="$(cd -P "$(dirname "$SOURCE")" && pwd)" - -java -jar "$DIR/$JARFILE" -x "$SCRIPTFILE" "$@" -exit 0 \ No newline at end of file diff --git a/vipra-cmd/build.xml b/vipra-cmd/build.xml new file mode 100644 index 0000000000000000000000000000000000000000..54fb322d91e52e72979db75fe109199db9c44037 --- /dev/null +++ b/vipra-cmd/build.xml @@ -0,0 +1,79 @@ +<?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 21fa1c430d6b9c75f5b0eafe424500f380aec859..39fe21d5384db734c6ef5e55d130c4d37836b9ef 100644 --- a/vipra-cmd/pom.xml +++ b/vipra-cmd/pom.xml @@ -42,12 +42,12 @@ <dependency> <groupId>edu.stanford.nlp</groupId> <artifactId>stanford-corenlp</artifactId> - <version>3.5.2</version> + <version>3.6.0</version> </dependency> <dependency> <groupId>edu.stanford.nlp</groupId> <artifactId>stanford-corenlp</artifactId> - <version>3.5.2</version> + <version>3.6.0</version> <classifier>models</classifier> </dependency> @@ -92,4 +92,30 @@ <version>0.0.1-SNAPSHOT</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.4.3</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <transformers> + <transformer + implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <mainClass>de.vipra.cmd.Main</mainClass> + </transformer> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/vipra-cmd/test/test-1.json b/vipra-cmd/test/test-1.json deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000