Merge branch 'master' into histodb_dataserver

itesla · Sep 7, 2016 · 0c46a8e · 0c46a8e
2 parents 2b33362 + 6bed900
commit 0c46a8e
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 8 deletions.
diff --git a/logback-cmdline.xml → config/logback-cmdline.xml b/logback-cmdline.xml → config/logback-cmdline.xml
diff --git a/logback_wp5.xml → config/logback-wp5.xml b/logback_wp5.xml → config/logback-wp5.xml
diff --git a/logback.xml → config/logback.xml b/logback.xml → config/logback.xml
diff --git a/distribution/src/main/resources/assemblies/full.xml b/distribution/src/main/resources/assemblies/full.xml
@@ -23,11 +23,12 @@
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/..</directory>
-            <outputDirectory>share/java</outputDirectory>
+            <directory>${project.basedir}/../config</directory>
+            <outputDirectory>etc</outputDirectory>
             <includes>
                 <include>logback*.xml</include>
             </includes>
+            <fileMode>0644</fileMode>
         </fileSet>
         <fileSet>
             <directory>${project.basedir}/../build/bin</directory>

diff --git a/...-converter/src/main/resources/logback.xml → ...-converter/src/test/resources/logback.xml b/...-converter/src/main/resources/logback.xml → ...-converter/src/test/resources/logback.xml
diff --git a/...ica-export/src/main/resources/logback.xml → ...ica-export/src/test/resources/logback.xml b/...ica-export/src/main/resources/logback.xml → ...ica-export/src/test/resources/logback.xml
diff --git a/scripts/itools b/scripts/itools
@@ -32,10 +32,12 @@ done
 [ -n "$itesla_cache_dir" ] && options+="-Ditesla.cache.dir=$itesla_cache_dir"
 [ -n "$itesla_config_dir" ] && options+=" -Ditesla.config.dir=$itesla_config_dir"
 [ -n "$itesla_config_name" ] && options+=" -Ditesla.config.name=$itesla_config_name"
-options+=" -Dlogback.configurationFile=$installDir/share/java/logback-cmdline.xml"
+options+=" -Dlogback.configurationFile="
+[ -f "$itesla_config_dir/logback-cmdline.xml" ] && options+="$itesla_config_dir" || options+="$installDir/etc"
+options+="/logback-cmdline.xml"
 
 $JAVA_HOME/bin/java \
 -Xmx8G \
--cp "$installDir/share/java/*:$installDir/share/java" \
+-cp "$installDir/share/java/*" \
 $options \
 eu.itesla_project.commons.tools.Main ${args[@]}
diff --git a/scripts/offline-mpi-task.sh b/scripts/offline-mpi-task.sh
@@ -20,7 +20,7 @@ fi
 tmpdir=$HOME/tmp 
 mkdir $tmpdir > /dev/null 2>&1
 
-export CLASSPATH=$installDir/share/java/*:$installDir/share/java:$CLASSPATH
+export CLASSPATH=$installDir/share/java/*:$CLASSPATH
 rank=$OMPI_COMM_WORLD_RANK
 if [ $rank = 0 ]; then
     if [ -z $JAVA_HOME ]; then
@@ -34,6 +34,9 @@ if [ $rank = 0 ]; then
     options+=" -Dcom.sun.management.jmxremote.port=6666"
     options+=" -Dcom.sun.management.jmxremote.authenticate=false"
     options+=" -Dcom.sun.management.jmxremote.ssl=false"
+    options+=" -Dlogback.configurationFile="
+    [ -f "$itesla_config_dir/logback.xml" ] && options+="$itesla_config_dir" || options+="$installDir/etc"
+    options+="/logback.xml"
     $JAVA_HOME/bin/java \
 -Xmx8G \
 -verbose:gc -XX:+PrintGCTimeStamps -Xloggc:$tmpdir/gc.log \

diff --git a/scripts/online-mpi-task.sh b/scripts/online-mpi-task.sh
@@ -23,7 +23,7 @@ mkdir $tmpdir > /dev/null 2>&1
 
 export PATH=$installBinDir:$PATH
 
-export CLASSPATH=$installDir/share/java/*:$installDir/share/java:$CLASSPATH
+export CLASSPATH=$installDir/share/java/*:$CLASSPATH
 rank=$OMPI_COMM_WORLD_RANK
 
 if [ $rank = 0 ]; then
@@ -38,8 +38,10 @@ if [ $rank = 0 ]; then
     options+=" -Dcom.sun.management.jmxremote.port=6667"
     options+=" -Dcom.sun.management.jmxremote.authenticate=false"
     options+=" -Dcom.sun.management.jmxremote.ssl=false"
-    options+=" -Djava.io.tmpdir=$installDir/tmp" 
-    options+=" -Dlogback.configurationFile=$installDir/share/java/logback_wp5.xml"
+    options+=" -Djava.io.tmpdir=$installDir/tmp"
+    options+=" -Dlogback.configurationFile="
+    [ -f "$itesla_config_dir/logback-wp5.xml" ] && options+="$itesla_config_dir" || options+="$installDir/etc"
+    options+="/logback-wp5.xml"
     $JAVA_HOME/bin/java \
 -Xmx2048m \
 -verbose:gc -XX:+PrintGCTimeStamps -Xloggc:$installDir/logs/gc.log \