From 260828cefcf0c618f14b192508bd8040d17c11f8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 9 Sep 2019 21:17:28 +0200
Subject: [PATCH] new scripts

---
 mappings/collectExtraction.sh         |  2 +-
 mappings/download.mappings.properties |  4 ++--
 mappings/mappings-release.sh          | 22 ++++++++++++----------
 3 files changed, 15 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 mappings/collectExtraction.sh

diff --git a/mappings/collectExtraction.sh b/mappings/collectExtraction.sh
old mode 100644
new mode 100755
index 4baa119..c51c7ce
--- a/mappings/collectExtraction.sh
+++ b/mappings/collectExtraction.sh
@@ -8,7 +8,7 @@ set -e
 BASEDIR="/data/extraction/wikidumps/"
 
 #databus-maven-plugin project, containing release pom
-DATABUSMVNPOMDIR="/data/extraction/databus-maven-plugin/dbpedia/generic"
+DATABUSMVNPOMDIR="/data/extraction/databus-maven-plugin/dbpedia/mappings"
 
 #explicit databus version or empty for all
 DUMPDATE=
diff --git a/mappings/download.mappings.properties b/mappings/download.mappings.properties
index b67a1aa..dff4b47 100644
--- a/mappings/download.mappings.properties
+++ b/mappings/download.mappings.properties
@@ -1,5 +1,5 @@
 # Default download server. It lists mirrors which may be faster.
-base-url=https://dumps.wikimedia.org/
+base-url=http://dumps.wikimedia.your.org/
 
 # the source file name
 # should be the same as in universal.properties
@@ -16,4 +16,4 @@ retry-max=5
 retry-millis=10000
 
 #for specific dump dates (e.g. 20170101) if empty: the most recent dump-date is used
-dump-date=
\ No newline at end of file
+dump-date=
diff --git a/mappings/mappings-release.sh b/mappings/mappings-release.sh
index c4bd766..1f9c446 100755
--- a/mappings/mappings-release.sh
+++ b/mappings/mappings-release.sh
@@ -16,12 +16,6 @@ BASEDIR="/data/extraction/wikidumps";
 #https://github.com/dbpedia/databus-maven-plugin/blob/master/dbpedia/mappings/pom.xml
 DATABUSMAVENPOMDIR="/data/extraction/databus-maven-plugin/dbpedia/mappings";
 
-#override release pom.xml properties
-RELEASEPUBLISHER="https://vehnem.github.io/webid.ttl#this";
-RELEASEPACKAGEDIR="/data/extraction/release";
-RELEASEDOWNLOADURL="http://dbpedia-mappings.tib.eu/release";
-RELEASELABELPREFIX="(pre-release)"
-RELEASECOMMENTPREFIX="(MARVIN is the DBpedia bot, that runs the DBpedia Information Extraction Framework (DIEF) and releases the data as is, i.e. unparsed, unsorted, not redirected for debugging the software. After its releases, data is cleaned and persisted under the dbpedia account.)"
 
 #logging directory
 LOGS="/data/extraction/logs/$(date +%Y-%m-%d)";
@@ -88,11 +82,19 @@ setNewVersion() {
 }
 
 deployRelease() {
+
+#override release pom.xml properties
+RELEASEPUBLISHER="https://vehnem.github.io/webid.ttl#this";
+RELEASEPACKAGEDIR="/data/extraction/release/\${project.groupId}/\${project.artifactId}"
+RELEASEDOWNLOADURL="http://dbpedia-mappings.tib.eu/release/\${project.groupId}/\${project.artifactId}/\${project.version}/";
+RELEASELABELPREFIX="(pre-release)"
+RELEASECOMMENTPREFIX="(MARVIN is the DBpedia bot, that runs the DBpedia Information Extraction Framework (DIEF) and releases the data as is, i.e. unparsed, unsorted, not redirected for debugging the software. After its releases, data is cleaned and persisted under the dbpedia account.)"
+
     cd $DATABUSMAVENPOMDIR;
     mvn deploy \
 	-Ddatabus.publisher="$RELEASEPUBLISHER" \
-	-Ddatabus.packageDirectory="$RELEASEPACKAGEDIR/\${project.groupId}/\${project.artifactId}" \
-	-Ddatabus.downloadUrlPath="$RELEASEDOWNLOADURL/\${project.groupId}/\${project.artifactId}/\${project.version}" \
+	-Ddatabus.packageDirectory="$RELEASEPACKAGEDIR" \
+	-Ddatabus.downloadUrlPath="$RELEASEDOWNLOADURL" \
 	-Ddatabus.labelPrefix="$RELEASELABELPREFIX" \
 	-Ddatabus.commentPrefix="$RELEASECOMMENTPREFIX";
 }
@@ -138,6 +140,6 @@ main() {
     compressLogs;
 }
 
-if [ ! -f "$SCRIPTROOT/generic-release.pid" ]; then
-        (execWithLogging main; rm "$SCRIPTROOT/generic-release.pid") & echo $! > "$SCRIPTROOT/generic-release.pid"
+if [ ! -f "$SCRIPTROOT/mappings-release.pid" ]; then
+        (execWithLogging main; rm "$SCRIPTROOT/mappings-release.pid") & echo $! > "$SCRIPTROOT/mappings-release.pid"
 fi
-- 
GitLab