From 58d486c2985fe67432d5d36e2d14fe2924e96dcc Mon Sep 17 00:00:00 2001
From: Eike Cochu <eike@cochu.com>
Date: Thu, 14 Jan 2016 12:44:03 +0100
Subject: [PATCH] fixed morphia save problem
due to processedarticle renaming, articles would be stored as "processedarticle", renamed entity to article
added null check to importing
removed file logging from cmd, need to add proper logging -> log messages were useless
updated build.xml due to new maven libs, reverted to old abs path scheme ... what do?
---
Vagrantfile | 1 -
ma-impl.sublime-workspace | 18 +--
vipra-cmd/build.xml | 148 +++++++++---------
.../de/vipra/cmd/model/ProcessedArticle.java | 2 +
.../de/vipra/cmd/option/ImportCommand.java | 8 +-
vipra-cmd/src/main/resources/log4j2.xml | 9 --
6 files changed, 85 insertions(+), 101 deletions(-)
diff --git a/Vagrantfile b/Vagrantfile
index a89510af..7facb0b9 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,7 +12,6 @@ Vagrant.configure(2) do |config|
master.vm.hostname = 'vipra-master'
master.vm.network :private_network, ip: '192.168.10.10'
master.vm.network :forwarded_port, guest: 27017, host: 27017 # MongoDB
- master.vm.network :forwarded_port, guest: 8081, host: 8081 # MongoDB Express
master.vm.network :forwarded_port, guest: 8080, host: 8000 # Tomcat
master.vm.network :forwarded_port, guest: 9200, host: 9200 # ElasticSearch REST API
end
diff --git a/ma-impl.sublime-workspace b/ma-impl.sublime-workspace
index 459dd038..b318812c 100644
--- a/ma-impl.sublime-workspace
+++ b/ma-impl.sublime-workspace
@@ -453,23 +453,7 @@
},
"expanded_folders":
[
- "/home/eike/repos/master/ma-impl",
- "/home/eike/repos/master/ma-impl/vipra-ui/app",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/adapters",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/components",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/controllers",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/helpers",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/models",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/routes",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/articles",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/topics",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/topics/show",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/styles",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/templates",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/articles",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics",
- "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics/show",
- "/home/eike/repos/master/ma-impl/vm"
+ "/home/eike/repos/master/ma-impl"
],
"file_history":
[
diff --git a/vipra-cmd/build.xml b/vipra-cmd/build.xml
index 73e312b3..469d63d8 100644
--- a/vipra-cmd/build.xml
+++ b/vipra-cmd/build.xml
@@ -1,75 +1,79 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project default="create_run_jar" name="Create Runnable Jar for Project vipra-cmd">
- <!--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" />
- <property name="dir.maven" value="${user.home}/.m2/repository" />
- <target name="create_run_jar">
- <jar destfile="${dir.jarfile}/vipra-cmd.jar" filesetmanifest="mergewithoutmain">
- <manifest>
- <attribute name="Main-Class" value="de.vipra.cmd.Main" />
- <attribute name="Class-Path" value="." />
- </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" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/commons-io/commons-io/2.4/commons-io-2.4.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/logging/log4j/log4j-api/2.4.1/log4j-api-2.4.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/logging/log4j/log4j-core/2.4.1/log4j-core-2.4.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/logging/log4j/log4j-slf4j-impl/2.4.1/log4j-slf4j-impl-2.4.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/mongodb/mongodb-driver/3.2.0/mongodb-driver-3.2.0.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/mongodb/bson/3.2.0/bson-3.2.0.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/mongodb/mongodb-driver-core/3.2.0/mongodb-driver-core-3.2.0.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/elasticsearch/elasticsearch/2.1.0/elasticsearch-2.1.0.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-core/5.3.1/lucene-core-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-backward-codecs/5.3.1/lucene-backward-codecs-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-analyzers-common/5.3.1/lucene-analyzers-common-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-queries/5.3.1/lucene-queries-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-memory/5.3.1/lucene-memory-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-highlighter/5.3.1/lucene-highlighter-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-queryparser/5.3.1/lucene-queryparser-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-sandbox/5.3.1/lucene-sandbox-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-suggest/5.3.1/lucene-suggest-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-misc/5.3.1/lucene-misc-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-join/5.3.1/lucene-join-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-grouping/5.3.1/lucene-grouping-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-spatial/5.3.1/lucene-spatial-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-spatial3d/5.3.1/lucene-spatial3d-5.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/spatial4j/spatial4j/0.4.1/spatial4j-0.4.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/google/guava/guava/18.0/guava-18.0.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/carrotsearch/hppc/0.7.1/hppc-0.7.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/joda-time/joda-time/2.8.2/joda-time-2.8.2.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/joda/joda-convert/1.2/joda-convert-1.2.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/fasterxml/jackson/core/jackson-core/2.6.2/jackson-core-2.6.2.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.6.2/jackson-dataformat-smile-2.6.2.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.6.2/jackson-dataformat-yaml-2.6.2.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/yaml/snakeyaml/1.15/snakeyaml-1.15.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.6.2/jackson-dataformat-cbor-2.6.2.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/io/netty/netty/3.10.5.Final/netty-3.10.5.Final.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/ning/compress-lzf/1.0.2/compress-lzf-1.0.2.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/tdunning/t-digest/3.0/t-digest-3.0.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/hdrhistogram/HdrHistogram/2.1.6/HdrHistogram-2.1.6.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/commons-cli/commons-cli/1.3.1/commons-cli-1.3.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/twitter/jsr166e/1.1.0/jsr166e-1.1.0.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/args4j/args4j/2.0.6/args4j-2.0.6.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/edu/stanford/nlp/stanford-corenlp/3.5.2/stanford-corenlp-3.5.2.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/io7m/xom/xom/1.2.10/xom-1.2.10.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/xalan/xalan/2.7.0/xalan-2.7.0.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/de/jollyday/jollyday/0.4.7/jollyday-0.4.7.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/javax/xml/bind/jaxb-api/2.2.7/jaxb-api-2.2.7.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/com/googlecode/efficient-java-matrix-library/ejml/0.23/ejml-0.23.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/javax/json/javax.json-api/1.0/javax.json-api-1.0.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-core/5.4.0/lucene-core-5.4.0.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/apache/lucene/lucene-analyzers-common/5.4.0/lucene-analyzers-common-5.4.0.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/junit/junit/4.12/junit-4.12.jar" />
- <zipfileset excludes="META-INF/*.SF" src="${dir.maven}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" />
- </jar>
- </target>
+ <!--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" filesetmanifest="mergewithoutmain">
+ <manifest>
+ <attribute name="Main-Class" value="de.vipra.cmd.Main"/>
+ <attribute name="Class-Path" value="."/>
+ </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"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/logging/log4j/log4j-api/2.4.1/log4j-api-2.4.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/logging/log4j/log4j-core/2.4.1/log4j-core-2.4.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/logging/log4j/log4j-slf4j-impl/2.4.1/log4j-slf4j-impl-2.4.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/mongodb/mongodb-driver/3.2.0/mongodb-driver-3.2.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/mongodb/bson/3.2.0/bson-3.2.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/mongodb/mongodb-driver-core/3.2.0/mongodb-driver-core-3.2.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/mongodb/morphia/morphia/1.0.1/morphia-1.0.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/mongodb/mongo-java-driver/3.0.2/mongo-java-driver-3.0.2.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/thoughtworks/proxytoys/proxytoys/1.0/proxytoys-1.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/mongodb/morphia/morphia-logging-slf4j/1.0.1/morphia-logging-slf4j-1.0.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/elasticsearch/elasticsearch/2.1.0/elasticsearch-2.1.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-core/5.3.1/lucene-core-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-backward-codecs/5.3.1/lucene-backward-codecs-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-analyzers-common/5.3.1/lucene-analyzers-common-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-queries/5.3.1/lucene-queries-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-memory/5.3.1/lucene-memory-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-highlighter/5.3.1/lucene-highlighter-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-queryparser/5.3.1/lucene-queryparser-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-sandbox/5.3.1/lucene-sandbox-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-suggest/5.3.1/lucene-suggest-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-misc/5.3.1/lucene-misc-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-join/5.3.1/lucene-join-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-grouping/5.3.1/lucene-grouping-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-spatial/5.3.1/lucene-spatial-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-spatial3d/5.3.1/lucene-spatial3d-5.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/spatial4j/spatial4j/0.4.1/spatial4j-0.4.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/google/guava/guava/18.0/guava-18.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/carrotsearch/hppc/0.7.1/hppc-0.7.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/joda-time/joda-time/2.8.2/joda-time-2.8.2.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.6.2/jackson-core-2.6.2.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.6.2/jackson-dataformat-smile-2.6.2.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.6.2/jackson-dataformat-yaml-2.6.2.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/yaml/snakeyaml/1.15/snakeyaml-1.15.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.6.2/jackson-dataformat-cbor-2.6.2.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/io/netty/netty/3.10.5.Final/netty-3.10.5.Final.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/ning/compress-lzf/1.0.2/compress-lzf-1.0.2.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/tdunning/t-digest/3.0/t-digest-3.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/hdrhistogram/HdrHistogram/2.1.6/HdrHistogram-2.1.6.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/commons-cli/commons-cli/1.3.1/commons-cli-1.3.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/twitter/jsr166e/1.1.0/jsr166e-1.1.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/args4j/args4j/2.0.6/args4j-2.0.6.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/edu/stanford/nlp/stanford-corenlp/3.5.2/stanford-corenlp-3.5.2.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/io7m/xom/xom/1.2.10/xom-1.2.10.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/de/jollyday/jollyday/0.4.7/jollyday-0.4.7.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/javax/xml/bind/jaxb-api/2.2.7/jaxb-api-2.2.7.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/com/googlecode/efficient-java-matrix-library/ejml/0.23/ejml-0.23.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/javax/json/javax.json-api/1.0/javax.json-api-1.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-core/5.4.0/lucene-core-5.4.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/apache/lucene/lucene-analyzers-common/5.4.0/lucene-analyzers-common-5.4.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/junit/junit/4.12/junit-4.12.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="/home/eike/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+ </jar>
+ </target>
</project>
diff --git a/vipra-cmd/src/main/java/de/vipra/cmd/model/ProcessedArticle.java b/vipra-cmd/src/main/java/de/vipra/cmd/model/ProcessedArticle.java
index 8611f4ef..897bcc0a 100644
--- a/vipra-cmd/src/main/java/de/vipra/cmd/model/ProcessedArticle.java
+++ b/vipra-cmd/src/main/java/de/vipra/cmd/model/ProcessedArticle.java
@@ -1,10 +1,12 @@
package de.vipra.cmd.model;
import org.json.simple.JSONObject;
+import org.mongodb.morphia.annotations.Entity;
import org.mongodb.morphia.annotations.Transient;
import de.vipra.cmd.text.ProcessedText;
+@Entity(value = "articles", noClassnameStored = true)
public class ProcessedArticle extends de.vipra.util.model.Article {
@Transient
diff --git a/vipra-cmd/src/main/java/de/vipra/cmd/option/ImportCommand.java b/vipra-cmd/src/main/java/de/vipra/cmd/option/ImportCommand.java
index 1433affc..333f3924 100644
--- a/vipra-cmd/src/main/java/de/vipra/cmd/option/ImportCommand.java
+++ b/vipra-cmd/src/main/java/de/vipra/cmd/option/ImportCommand.java
@@ -198,7 +198,10 @@ public class ImportCommand implements Command {
log.error("no object id for topic index " + tc.getId());
}
ProcessedArticle a = dbArticles.getSingle(id);
- a.setTopics(topicCount);
+ if (a != null)
+ a.setTopics(topicCount);
+ else
+ log.error("no article found in db for id " + id);
try {
dbArticles.updateSingle(a);
} catch (DatabaseException e) {
@@ -211,7 +214,8 @@ public class ImportCommand implements Command {
public void run() throws ExecutionException {
try {
config = Config.getConfig();
- dbArticles = DatabaseService.getDatabaseService(config, Constants.Collection.ARTICLES, ProcessedArticle.class);
+ dbArticles = DatabaseService.getDatabaseService(config, Constants.Collection.ARTICLES,
+ ProcessedArticle.class);
dbTopics = DatabaseService.getDatabaseService(config, Constants.Collection.TOPICS, Topic.class);
filebase = Filebase.getFilebase(config);
preprocessor = Processor.getPreprocessor(config);
diff --git a/vipra-cmd/src/main/resources/log4j2.xml b/vipra-cmd/src/main/resources/log4j2.xml
index f2c17f38..2fc755c1 100644
--- a/vipra-cmd/src/main/resources/log4j2.xml
+++ b/vipra-cmd/src/main/resources/log4j2.xml
@@ -4,19 +4,10 @@
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%highlight{%-5level - %msg%n}{FATAL=red,ERROR=red,WARN=red,INFO=normal,DEBUG=normal,TRACE=normal}" />
</Console>
- <File name="File" fileName="vipra-cmd.log" append="false">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n" />
- <Filters>
- <ThresholdFilter level="INFO" onMatch="DENY" onMismatch="NEUTRAL"/>
- <ThresholdFilter level="DEBUG" onMatch="DENY" onMismatch="NEUTRAL"/>
- <ThresholdFilter level="TRACE" onMatch="DENY" onMismatch="NEUTRAL"/>
- </Filters>
- </File>
</Appenders>
<Loggers>
<Root level="ERROR">
<AppenderRef ref="Console" />
- <AppenderRef ref="File" />
</Root>
<Logger name="shellout" level="INFO" />
</Loggers>
--
GitLab