From 51efff8e2a6c20d5e67ce7b045b7b5c6afb60ebe Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Wed, 21 Oct 2015 11:32:45 +0200
Subject: [PATCH] fixed problems with filenames in config
---
CHANGELOG.md | 1 +
bootstrap/prepareEnvironment.sh | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 53638 -> 53637 bytes
gradle/wrapper/gradle-wrapper.properties | 4 ++--
gradlew | 4 ++--
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13f0793..68ef466 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
Upcoming version:
-----------------
+ - fixed problems with filenames in config (Nikolaus Krismer)
- merged (Nikolaus Krismer)
- re-activated Neo4J-spatial (with help from Robert Bierbauer's and his master thesis) (Nikolaus Krismer)
- now creating node_densities for updated datasets (Nikolaus Krismer)
diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh
index a55c3e6..c125d40 100755
--- a/bootstrap/prepareEnvironment.sh
+++ b/bootstrap/prepareEnvironment.sh
@@ -603,7 +603,7 @@ if $INSTALL_NEO4J; then
echo " - enabling neo4j network access (without user)"
echo "org.neo4j.server.webserver.address=0.0.0.0" >> $DEPLOY_DIR/neo4j/conf/neo4j-server.properties
- sed -i "s/dbms\.security\.auth\_enabled=true/dbms\.security\.auth\_enabled=false/" $DEPLOY_DIR/neo4j/conf/neo4-server.properties
+ sed -i "s/dbms\.security\.auth\_enabled=true/dbms\.security\.auth\_enabled=false/" $DEPLOY_DIR/neo4j/conf/neo4j-server.properties
echo " - creating systemd service"
cp "$SHARED_CONF_DIR/neo4j.service" "/etc/systemd/system/neo4j.service" >> $DEPLOY_DIR/neo4j/conf/neo4j-server.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e8c6bf7bb47dff6b81c2cf7a349eb7e912c9fbe2..05ef575b0cd0173fc735f2857ce4bd594ce4f6bd 100644
GIT binary patch
delta 1318
zcmZXTc`%f57{}jzU&lI2yQESocC)$`os62T#8}t1E1E)OSvn+|G%;$ERgFk*RMJes
zZc|OE4VhG{Wf!|yx~9ua2b=C~x+U6ueny)9c<1wczrW}CUGMXgR1mopgk1!eFtf%m
zDiyPtB`C6EQjG{qS25j-{G#cr3~8UzDA?be{+WUz*%ZPAjR)Wx+XRwDd2XWI4o}Cy
z$T52b#%A+MFywS9%>o=x`$x#JaA2E*v(V`fa<tAXEx}<-UP*%>+s78=99-aJ1CDg*
zcWVevg>|6`cSl;H@&i$kR4d~y0*{E6bVZQ8aZAGOS)q}J@L4>zcLbYV<Ly=FJ(r)l
z-Oiq3?OdAXNbeC<F^|%pNXIgy-IZ^cuY_ri#rk5QUi$c-V}CTxxj~=fsUvr;W$e0^
zqGa0!WDEp5h<E-d;&5y6fD)$|8-M3OF=O1}O<z90onuv(*`nb-o~s>bSk4WQl~LbK
z%*qX_Ies-s-0;$4bk&=LK}n`q<0bj_p{DD&Yk`|@ZY)dImtsg+MnCE7>*wiK;QrJ6
zLVc}pYI67l5#KADS)ws3&t}T+ZCstww_YEd>T}|!bj8xJQn~o~DC?H5S@U=8y)y9O
z#r>oCTuEN63o}@-C#R}=LcP@0D&py9pXlkugG8y%uhf^-{v~B0jF}IA+zD5P4UG7?
z##53z*3BS{l*`ub!yQb=_Kr&^lwugxYy3ROOZo1kP*?{klM)7T2qq`JMuF`{k^)7G
z$0iM`Eio*QhGG6t<kaROH*D&(go37Rt^@@73_ldOXWlgjr*C&31%mH;?xSSgfllO9
z<ex*!@Cwh2ft>#GPslM;K10D>S*;li<)0@A*h;OUI{g@qVP`Fdx1w{AKf8Du735xy
zL9_SBIjE9#wF5c*^#YW`Zy*UP(_N?*v$~g)A8#(={NGmd1pl|yzs*F!>BR6$Bey8#
z3_msUoWj@C(qyk<HgJ67JRrYu5%5T37_g^t3oz<dC{T7Q8i*@nf$>VDZzxxTc4-O*
zCO7eb*PFONn`V@k*vtpr&>RV*tI)hcRXpf6Rmh0<<f;yWYd|j{RqaSgBqi!;ru!zV
z)xN;@>NUWS7C!KFiwJ1jngq;fMdJ^KG^cGn_|mowK$?aJ6lvmtw}<o;Z35{1+O5Ff
zT9n7T9Si#M5NYj+ptIVefDhWyx*VMV^f4XU58fdJo!k)vZ0$%K@rxI923f=@j2(~t
E0prFX5C8xG
delta 1323
zcmZvbeN4=89LIlmzw7!HH9gWibWBvpIX6+G#Kc{fe$`bIiXPlNR~%|1C6p}r4%wK8
z>S{-GT#CuMbJca%J=D^$F|m$Jqq3c+JluW0A?A<YUZ3~-`}usIexGkqC3&=xbcqp?
zEN6nCDB^@LsN7{1WkcjuS}H3KP4YbdA$usBLHwOlGo7@jcK8FVTsu$z<At3{7iJC<
zj6&9HFm^apfuZ!IJlNm_x<0`U+l}i0&Jyoa*fC5>a0JJXli&ft!G+^-&dJ5z<G_)v
z_~;D5<>+U4!hEqKE-y(GQ%?5%`|QbjOQZgjh#0HU97jdZi{bKVuA-iIOTpvC?v}c^
z(p(;wZwd6*n+2kvfCkZgL6mMykI1C!3k)>Q(HTUyEzB|Jmf9w*fAny<2^~oFJ7nCc
z;Y>L4zDeN4YEZvW`85i}LB+Xs-btY=*>hD1zRgu@tXAW|K-rU#m!@QH#oj2l;saEo
zuOgnh_HNR|sG-9rFZK-=-k!0jsP}D6w^SnQ9qtd8>$m}r`Kji*h&EB7PCitdn=Pzf
zMb%DycfsWIw196p|0%mzaW+}LF1MhXb64Z~yyC=KIwvI7stGx*|LpdCIP2?<L2I5q
zPwyHrC9|~RzTdX!ef8q7;8WXEE|u4%eh<66PGUTRzAfovIqZ$p1~)TBpUFQz*LFy>
zf74vjMrF;W<4iaEsd*_GWio;w`fZ;-x>-6CrKdMS%Cw9hOb9rVH#iu-4Kbi7Y@+0c
z){!8Nc@V@>DDu)zQ4VhJa)g4GJ-#Faul9xFU}j#o12|vuzc3*9SkQx$%_UvfsVu#Q
zm!ZpQ-63b>$`E!2t9o(JUDLpVq0;Ll30rAUDRL^91R-bt+Dg8jjV7DDmAyBv;-aEk
z8}JGi<#JpdaHkVHBX{F*PFxcro$UAVRIYZ4MDLrIMf}rRyhh#v`ai8@`KzHAOi%Ln
zb3;2-{NL{l$yFitzDBQA^MO9<MZj3~G9Xe%1N+pwfC&#oK-q&NAVaeexLJeseN8gx
z$t?n)q=g1HwFrUEtvD~EH4gN>Rx!|{4bPj_mIhka7B%KkP1CN1d%&+@m)4811r=#$
z+b<p6(1rj9wCjPw_Bh~`_AS71Itfs!!{a@pI$XaQ{A&GHpnC@m%<M=58b&q8kOBI*
zAqzNSz<Dvoji7Ii(%qB^I?t2{>@neW!_D!a&zbRl7@g^$C7m09?VXup{&8^EYIds1
H*7n3tQ<4Ia
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 25e6c8a..1cba21a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 15 13:21:57 CEST 2015
+#Wed Oct 21 11:13:11 CEST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip
diff --git a/gradlew b/gradlew
index 97fac78..9d82f78 100755
--- a/gradlew
+++ b/gradlew
@@ -56,9 +56,9 @@ while [ -h "$PRG" ] ; do
fi
done
SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
--
GitLab