Merge branch 'master' of sissource.ethz.ch:sispub/openbis

datastore_server/dist/etc/datastore_server.conf

@@ -15,7 +15,7 @@ JAVA_OPTS=${JAVA_OPTS:=-server -d64 -Djavax.net.ssl.trustStore=etc/openBIS.keyst
 #
 # Memory options to the JRE
 #
-JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
+JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m -XX:+UseG1GC -XX:+CMSClassUnloadingEnabled"
 
 #
 # Maximal number of log files to keep

installation/resource/tarball/run-console.sh

@@ -11,10 +11,10 @@ fi
 
 if [[ "$_java" ]]; then
     version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}'| cut -c1-3)
-    if [[ "$version" > "1.6" ]]; then
+    if [[ "$version" > "1.7" ]]; then
         echo Java version $version found.
     else         
-        echo Java version $version found is under the required 1.7.
+        echo Java version $version found is under the required 1.8.
         exit -1
     fi
 fi

installation/resource/tarball/run-ui.sh

@@ -11,10 +11,10 @@ fi
 
 if [[ "$_java" ]]; then
     version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}'| cut -c1-3)
-    if [[ "$version" > "1.6" ]]; then
+    if [[ "$version" > "1.7" ]]; then
         echo Java version $version found.
     else         
-        echo Java version $version found is under the required 1.7.
+        echo Java version $version found is under the required 1.8.
         exit -1
     fi
 fi

openbis/dist/server/openbis.conf

@@ -15,7 +15,7 @@ JAVA_OPTS=${JAVA_OPTS:=-server -d64}
 #
 # Memory options to the JRE
 #
-JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
+JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m -XX:+UseG1GC -XX:+CMSClassUnloadingEnabled"
 
 #
 # OpenBIS options

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js

@@ -422,7 +422,7 @@ function SampleFormController(mainController, mode, sample, paginationInfo) {
 				mainController.serverFacade.deleteSamples(samplesToDelete,  "Deleted to trashcan from eln sample form " + _this._sampleFormModel.sample.identifier, 
 															function(response) {
 																if(response.error) {
-																	Util.showError("Deletes failed, other changes where commited: " + response.error.message, callbackOk);
+																	Util.showError("Deletions failed, other changes were committed: " + response.error.message, callbackOk);
 																} else {
 																	Util.showSuccess(message, callbackOk);
 																}